diff options
-rw-r--r-- | include/asterisk/astobj2.h | 10 | ||||
-rw-r--r-- | main/astobj2.c | 16 |
2 files changed, 26 insertions, 0 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index d7bb91414..9cbaf78da 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -452,7 +452,12 @@ 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); +#endif /*! \brief * Unlock an object. @@ -460,7 +465,12 @@ int ao2_lock(void *a); * \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); +#endif /*! \brief * Try locking-- (don't block if fail) diff --git a/main/astobj2.c b/main/astobj2.c index d1fdcaaf7..df2f08942 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -139,7 +139,11 @@ 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 int ao2_lock(void *user_data) +#else +int _ao2_lock(void *user_data, const char *file, const char *func, int line, const char *var) +#endif { struct astobj2 *p = INTERNAL_OBJ(user_data); @@ -150,10 +154,18 @@ int ao2_lock(void *user_data) ast_atomic_fetchadd_int(&ao2.total_locked, 1); #endif +#ifndef DEBUG_THREADS return ast_mutex_lock(&p->priv_data.lock); +#else + return __ast_pthread_mutex_lock(file, line, func, var, &p->priv_data.lock); +#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) +#endif { struct astobj2 *p = INTERNAL_OBJ(user_data); @@ -164,7 +176,11 @@ int ao2_unlock(void *user_data) ast_atomic_fetchadd_int(&ao2.total_locked, -1); #endif +#ifndef DEBUG_THREADS return ast_mutex_unlock(&p->priv_data.lock); +#else + return __ast_pthread_mutex_unlock(file, line, func, var, &p->priv_data.lock); +#endif } int ao2_trylock(void *user_data) |