diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:05:55 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:05:55 +0000 |
| commit | a09fc51a9f76fda0ecc7806e1c6d47d7c5dca95b (patch) | |
| tree | 53cd05e3459a39f2544c0c775586b47e33e769b3 | |
| parent | 06c89ad29c07eefb88804403b9d9ff1e6895b54c (diff) | |
When compiling with DEBUG_THREADS, report the real file/func/line for ao2_lock/ao2_unlock
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@158539 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 ca05141b5..87c7f7353 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -185,7 +185,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 /*! * Unlock an object. @@ -193,7 +198,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 bcf34556e..2614cf7b4 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -125,7 +125,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); @@ -136,10 +140,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); @@ -150,7 +162,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 } /* |