diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-25 20:03:59 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-25 20:03:59 +0000 |
commit | 5656c244aba78f81bcb61f081907b09d7451b765 (patch) | |
tree | 3415cb83f366025b01311f51cfb8b928effdd524 | |
parent | 129cd3eb993e3b5b437f57bca3056b2a498a79d6 (diff) |
Fix DEBUG_THREADS issue with out-of-tree modules.
Take 2, without ABI breakage this time.
Review: https://reviewboard.asterisk.org/r/588/
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@254717 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | include/asterisk/astobj2.h | 15 | ||||
-rw-r--r-- | main/astobj2.c | 57 |
2 files changed, 54 insertions, 18 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index 0c780a26d..3b605720a 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -467,11 +467,10 @@ int _ao2_ref(void *o, int delta); * \param a A pointer to the object we want to lock. * \return 0 on success, other values on error. */ -#ifndef DEBUG_THREADS int ao2_lock(void *a); -#else -#define ao2_lock(a) _ao2_lock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a) int _ao2_lock(void *a, const char *file, const char *func, int line, const char *var); +#ifdef DEBUG_THREADS +#define ao2_lock(a) _ao2_lock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a) #endif /*! \brief @@ -480,11 +479,10 @@ int _ao2_lock(void *a, const char *file, const char *func, int line, const char * \param a A pointer to the object we want unlock. * \return 0 on success, other values on error. */ -#ifndef DEBUG_THREADS int ao2_unlock(void *a); -#else -#define ao2_unlock(a) _ao2_unlock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a) int _ao2_unlock(void *a, const char *file, const char *func, int line, const char *var); +#ifdef DEBUG_THREADS +#define ao2_unlock(a) _ao2_unlock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a) #endif /*! \brief @@ -493,11 +491,10 @@ int _ao2_unlock(void *a, const char *file, const char *func, int line, const cha * \param a A pointer to the object we want to lock. * \return 0 on success, other values on error. */ -#ifndef DEBUG_THREADS int ao2_trylock(void *a); -#else -#define ao2_trylock(a) _ao2_trylock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a) int _ao2_trylock(void *a, const char *file, const char *func, int line, const char *var); +#ifdef DEBUG_THREADS +#define ao2_trylock(a) _ao2_trylock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a) #endif /*! diff --git a/main/astobj2.c b/main/astobj2.c index 17dcb28b2..ab040b351 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -138,11 +138,28 @@ static void *__ao2_callback(struct ao2_container *c, char *tag, char *file, int line, const char *funcname); static void * __ao2_iterator_next(struct ao2_iterator *a, struct bucket_list **q); -#ifndef DEBUG_THREADS +#ifdef DEBUG_THREADS +/* Need to override the macros defined in astobj2.h */ +#undef ao2_lock +#undef ao2_trylock +#undef ao2_unlock +#endif + int ao2_lock(void *user_data) -#else -int _ao2_lock(void *user_data, const char *file, const char *func, int line, const char *var) +{ + struct astobj2 *p = INTERNAL_OBJ(user_data); + + if (p == NULL) + return -1; + +#ifdef AO2_DEBUG + ast_atomic_fetchadd_int(&ao2.total_locked, 1); #endif + + return ast_mutex_lock(&p->priv_data.lock); +} + +int _ao2_lock(void *user_data, const char *file, const char *func, int line, const char *var) { struct astobj2 *p = INTERNAL_OBJ(user_data); @@ -160,11 +177,21 @@ int _ao2_lock(void *user_data, const char *file, const char *func, int line, con #endif } -#ifndef DEBUG_THREADS int ao2_unlock(void *user_data) -#else -int _ao2_unlock(void *user_data, const char *file, const char *func, int line, const char *var) +{ + struct astobj2 *p = INTERNAL_OBJ(user_data); + + if (p == NULL) + return -1; + +#ifdef AO2_DEBUG + ast_atomic_fetchadd_int(&ao2.total_locked, -1); #endif + + return ast_mutex_unlock(&p->priv_data.lock); +} + +int _ao2_unlock(void *user_data, const char *file, const char *func, int line, const char *var) { struct astobj2 *p = INTERNAL_OBJ(user_data); @@ -182,11 +209,23 @@ int _ao2_unlock(void *user_data, const char *file, const char *func, int line, c #endif } -#ifndef DEBUG_THREADS int ao2_trylock(void *user_data) -#else -int _ao2_trylock(void *user_data, const char *file, const char *func, int line, const char *var) +{ + struct astobj2 *p = INTERNAL_OBJ(user_data); + int ret; + + if (p == NULL) + return -1; + ret = ast_mutex_trylock(&p->priv_data.lock); + +#ifdef AO2_DEBUG + if (!ret) + ast_atomic_fetchadd_int(&ao2.total_locked, 1); #endif + return ret; +} + +int _ao2_trylock(void *user_data, const char *file, const char *func, int line, const char *var) { struct astobj2 *p = INTERNAL_OBJ(user_data); int ret; |