diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/autoconfig.h.in | 8 | ||||
-rw-r--r-- | include/asterisk/lock.h | 92 | ||||
-rw-r--r-- | include/asterisk/pbx.h | 2 |
3 files changed, 22 insertions, 80 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index f8bd0e376..b95d52693 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -188,6 +188,9 @@ /* Define to 1 if you have the curses library. */ #undef HAVE_CURSES +/* Define to 1 if your C compiler provides __atomic operations. */ +#undef HAVE_C_ATOMICS + /* Define if your system has the DAHDI headers. */ #undef HAVE_DAHDI @@ -292,7 +295,7 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE -/* Define to 1 if your GCC C compiler provides atomic operations. */ +/* Define to 1 if your GCC C compiler provides __sync atomic operations. */ #undef HAVE_GCC_ATOMICS /* Define to 1 if you have the `getcwd' function. */ @@ -600,9 +603,6 @@ /* Define to 1 if you have the Open Sound System library. */ #undef HAVE_OSS -/* Define to 1 if OSX atomic operations are supported. */ -#undef HAVE_OSX_ATOMICS - /* Define to 1 if your system defines the file flag O_EVTONLY in fcntl.h */ #undef HAVE_O_EVTONLY diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 58c9a8383..c3dd691a8 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -617,97 +617,39 @@ static void __attribute__((destructor)) fini_##rwlock(void) \ #define pthread_create __use_ast_pthread_create_instead__ #endif -/* - * Support for atomic instructions. - * For platforms that have it, use the native cpu instruction to - * implement them. For other platforms, resort to a 'slow' version - * (defined in utils.c) that protects the atomic instruction with - * a single lock. - * The slow versions is always available, for testing purposes, - * as ast_atomic_fetchadd_int_slow() - */ - -int ast_atomic_fetchadd_int_slow(volatile int *p, int v); +/* Support for atomic instructions. */ #include "asterisk/inline_api.h" -#if defined(HAVE_OSX_ATOMICS) -#include "libkern/OSAtomic.h" +#if defined(HAVE_C_ATOMICS) +#define ast_atomic_fetch_add(p, v, memorder) __atomic_fetch_add(p, v, memorder) +#define ast_atomic_sub_fetch(p, v, memorder) __atomic_sub_fetch(p, v, memorder) +#elif defined(HAVE_GCC_ATOMICS) +#define ast_atomic_fetch_add(p, v, memorder) __sync_fetch_and_add(p, v) +#define ast_atomic_sub_fetch(p, v, memorder) __sync_sub_and_fetch(p, v) +#else +#error "Atomics not available." #endif -/*! \brief Atomically add v to *p and return * the previous value of *p. +/*! + * \brief Atomically add v to *p and return the previous value of *p. + * * This can be used to handle reference counts, and the return value * can be used to generate unique identifiers. */ - -#if defined(HAVE_GCC_ATOMICS) -AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), -{ - return __sync_fetch_and_add(p, v); -}) -#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 4) -AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), -{ - return OSAtomicAdd32(v, (int32_t *) p) - v; -}) -#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 8) -AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), -{ - return OSAtomicAdd64(v, (int64_t *) p) - v; -}) -#elif defined (__i386__) || defined(__x86_64__) -#ifdef sun -AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), -{ - __asm __volatile ( - " lock; xaddl %0, %1 ; " - : "+r" (v), /* 0 (result) */ - "=m" (*p) /* 1 */ - : "m" (*p)); /* 2 */ - return (v); -}) -#else /* ifndef sun */ AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), { - __asm __volatile ( - " lock xaddl %0, %1 ; " - : "+r" (v), /* 0 (result) */ - "=m" (*p) /* 1 */ - : "m" (*p)); /* 2 */ - return (v); + return ast_atomic_fetch_add(p, v, __ATOMIC_RELAXED); }) -#endif -#else /* low performance version in utils.c */ -AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), -{ - return ast_atomic_fetchadd_int_slow(p, v); -}) -#endif -/*! \brief decrement *p by 1 and return true if the variable has reached 0. +/*! + * \brief decrement *p by 1 and return true if the variable has reached 0. + * * Useful e.g. to check if a refcount has reached 0. */ -#if defined(HAVE_GCC_ATOMICS) -AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p), -{ - return __sync_sub_and_fetch(p, 1) == 0; -}) -#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 4) AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p), { - return OSAtomicAdd32( -1, (int32_t *) p) == 0; + return ast_atomic_sub_fetch(p, 1, __ATOMIC_RELAXED) == 0; }) -#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 8) -AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p), -{ - return OSAtomicAdd64( -1, (int64_t *) p) == 0; -}) -#else -AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p), -{ - int a = ast_atomic_fetchadd_int(p, -1); - return a == 1; /* true if the value is 0 now (so it was 1 previously) */ -}) -#endif #endif /* _ASTERISK_LOCK_H */ diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index c8c171a71..a40c6a45b 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -1432,7 +1432,7 @@ void ast_str_substitute_variables_varshead(struct ast_str **buf, ssize_t maxlen, * \param c Channel variables from which to extract values, and channel to pass to any dialplan functions. * \param headp If no channel is specified, a channel list from which to extract variable values * \param templ Variable template to expand. - * \param used Number of bytes read from the template. + * \param used Number of bytes read from the template. (May be NULL) */ void ast_str_substitute_variables_full(struct ast_str **buf, ssize_t maxlen, struct ast_channel *c, struct varshead *headp, const char *templ, size_t *used); /*! @} */ |