ObjFW  Check-in [8acda3b3fd]

Overview
Comment:Convert more macros to OF_INLINE functions.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 8acda3b3fded3265fd9533037b729794038ef68b3aee13dc81c0133a464bd0fe
User & Date: js on 2010-01-30 12:33:18
Other Links: manifest | tags
Context
2010-01-30
12:46
Change -[retainCount] back to size_t and cast, so we keep the old API. check-in: 2cb37ce407 user: js tags: trunk
12:33
Convert more macros to OF_INLINE functions. check-in: 8acda3b3fd user: js tags: trunk
12:00
Only install atomic.h if atomic ops are available. check-in: e31d209120 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified configure.ac from [3e5258149c] to [0e063e6d70].

︙︙
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215

		OBJCFLAGS="$OBJCFLAGS -march=i486"
		AC_TRY_LINK([#include <stdint.h>], [
			int32_t i, j;
			if (__sync_add_and_fetch(&i, 1))
				j = __sync_sub_and_fetch(&i, 1);
			while (!__sync_bool_compare_and_swap(&i, 0, 1));
			], [
			AC_MSG_RESULT(yes, with -march=i486)
			atomic_ops="gcc builtins (with -march=i486)"
			AC_DEFINE(OF_HAVE_GCC_ATOMIC_OPS, 1,
				[Whether gcc atomic operations are available])
			AC_SUBST(ATOMIC_OBJCFLAGS, "-march=i486")
			], [
			AC_MSG_RESULT(no)
			OBJCFLAGS="$old_OBJCFLAGS"])])








|








201
202
203
204
205
206
207
208
209
210
211
212
213
214
215

		OBJCFLAGS="$OBJCFLAGS -march=i486"
		AC_TRY_LINK([#include <stdint.h>], [
			int32_t i, j;
			if (__sync_add_and_fetch(&i, 1))
				j = __sync_sub_and_fetch(&i, 1);
			while (!__sync_bool_compare_and_swap(&i, 0, 1));
			], [
			AC_MSG_RESULT([yes, with -march=i486])
			atomic_ops="gcc builtins (with -march=i486)"
			AC_DEFINE(OF_HAVE_GCC_ATOMIC_OPS, 1,
				[Whether gcc atomic operations are available])
			AC_SUBST(ATOMIC_OBJCFLAGS, "-march=i486")
			], [
			AC_MSG_RESULT(no)
			OBJCFLAGS="$old_OBJCFLAGS"])])
︙︙

Modified src/atomic.h from [243643e5ed] to [465cd0b0aa]. 

1
2
3
4
5
6
7
8
9
10
11
12
13












14
15








16



































17











18











19
20









21
22
23

24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55

/*
 * Copyright (c) 2008 - 2009
 *   Jonathan Schleifer <js@webkeks.org>
 *
 * All rights reserved.
 *
 * This file is part of ObjFW. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE included in
 * the packaging of this file.
 */

#import "OFMacros.h"













#if !defined(OF_THREADS)
# define of_atomic_add32(p, i) (*p += i)








# define of_atomic_sub32(p, i) (*p -= i)



































# define of_atomic_or32(p, i) (*p |= i)











# define of_atomic_and32(p, i) (*p &= i)











# define of_atomic_xor32(p, i) (*p ^= i)










static OF_INLINE BOOL
of_atomic_cmpswap32(int32_t *p, int32_t o, int32_t n)
{

	if (*p == o) {
		*p = n;
		return YES;
	}

	return NO;
}
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
# define of_atomic_add32(p, i) __sync_add_and_fetch(p, i)
# define of_atomic_sub32(p, i) __sync_sub_and_fetch(p, i)
# define of_atomic_or32(p, i) __sync_or_and_fetch(p, i)
# define of_atomic_and32(p, i) __sync_and_and_fetch(p, i)
# define of_atomic_xor32(p, i) __sync_xor_and_fetch(p, i)
# define of_atomic_cmpswap32(p, o, n) __sync_bool_compare_and_swap(p, o, n)
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
# include <libkern/OSAtomic.h>
# define of_atomic_add32(p, i) OSAtomicAdd32Barrier(i, p)
# define of_atomic_sub32(p, i) OSAtomicAdd32Barriar(-(i), p)
# define of_atomic_inc32(p) OSAtomicIncrement32Barrier(p)
# define of_atomic_dec32(p) OSAtomicDecrement32Barrier(p)
# define of_atomic_or32(p, i) OSAtomicOr32Barrier(i, p)
# define of_atomic_and32(p, i) OSAtomicAnd32Barrier(i, p)
# define of_atomic_xor32(p, i) OSAtomicXor32Barrier(i, p)
# define of_atomic_cmpswap32(p, o, n) OSAtomicCompareAndSwap32Barrier(o, n, p)
#else
# error No atomic operations available!
#endif

#if !defined(OF_THREADS) || defined(OF_HAVE_GCC_ATOMIC_OPS)
# define of_atomic_inc32(p) of_atomic_add32(p, 1)
# define of_atomic_dec32(p) of_atomic_sub32(p, 1)
#endif














>
>
>
>
>
>
>
>
>
>
>
>

|
>
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
>
|
|
>
>
>
>
>
>
>
>
>

|

>






<

<
<
<
<
<
|

<
<
<
<
<
<
<
<
|
<
<

|
<
<
<
<

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116

117





118
119








120


121
122





/*
 * Copyright (c) 2008 - 2009
 *   Jonathan Schleifer <js@webkeks.org>
 *
 * All rights reserved.
 *
 * This file is part of ObjFW. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE included in
 * the packaging of this file.
 */

#import "OFMacros.h"

#if defined(OF_THREADS) && !defined(OF_HAVE_GCC_ATOMIC_OPS) && \
    !defined(OF_HAVE_LIBKERN_OSATOMIC_H)
# error No atomic operations available!
#endif

#ifdef OF_HAVE_LIBKERN_OSATOMIC_H
# include <libkern/OSAtomic.h>
#endif

static OF_INLINE int32_t
of_atomic_add32(volatile int32_t *p, int32_t i)
{
#if !defined(OF_THREADS)
	return (*p += i);
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
	return __sync_add_and_fetch(p, i);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
	return OSAtomicAdd32Barrier(i, p);
#endif
}

static OF_INLINE int32_t
of_atomic_sub32(volatile int32_t *p, int32_t i)
{
#if !defined(OF_THREADS)
	return (*p -= i);
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
	return __sync_sub_and_fetch(p, i);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
	return OSAtomicAdd32Barrier(-i, p);
#endif
}

static OF_INLINE int32_t
of_atomic_inc32(volatile int32_t *p)
{
#if !defined(OF_THREADS)
	return ++*p;
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
	return __sync_add_and_fetch(p, 1);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
	return OSAtomicIncrement32Barrier(p);
#endif
}

static OF_INLINE int32_t
of_atomic_dec32(volatile int32_t *p)
{
#if !defined(OF_THREADS)
	return --*p;
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
	return __sync_sub_and_fetch(p, 1);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
	return OSAtomicDecrement32Barrier(p);
#endif
}

static OF_INLINE uint32_t
of_atomic_or32(volatile uint32_t *p, uint32_t i)
{
#if !defined(OF_THREADS)
	return (*p |= i);
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
	return __sync_or_and_fetch(p, i);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
	return OSAtomicOr32Barrier(i, p);
#endif
}

static OF_INLINE uint32_t
of_atomic_and32(volatile uint32_t *p, uint32_t i)
{
#if !defined(OF_THREADS)
	return (*p &= i);
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
	return __sync_and_and_fetch(p, i);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
	return OSAtomicAnd32Barrier(i, p);
#endif
}

static OF_INLINE uint32_t
of_atomic_xor32(volatile uint32_t *p, uint32_t i)
{
#if !defined(OF_THREADS)
	return (*p ^= i);
#elif defined(OF_HAVE_GCC_ATOMIC_OPS)
	return __sync_xor_and_fetch(p, i);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)
	return OSAtomicXor32Barrier(i, p);
#endif
}

static OF_INLINE BOOL
of_atomic_cmpswap32(volatile int32_t *p, int32_t o, int32_t n)
{
#if !defined(OF_THREADS)
	if (*p == o) {
		*p = n;
		return YES;
	}

	return NO;

#elif defined(OF_HAVE_GCC_ATOMIC_OPS)





	return __sync_bool_compare_and_swap(p, o, n);
#elif defined(OF_HAVE_LIBKERN_OSATOMIC_H)








	return OSAtomicCompareAndSwap32Barrier(o, n, p);


#endif
}