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 5899885df..bb63496ca 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -192,7 +192,12 @@ int ao2_ref(void *o, int delta); * \param a A pointer to the object we want 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. @@ -200,7 +205,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 /*! * diff --git a/main/astobj2.c b/main/astobj2.c index 87dfd0385..77f0f2962 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -126,7 +126,11 @@ static inline struct astobj2 *INTERNAL_OBJ(void *user_data) */ #define EXTERNAL_OBJ(_p) ((_p) == NULL ? NULL : (_p)->user_data) +#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); @@ -137,10 +141,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); @@ -151,7 +163,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 } /* |