mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-24 22:58:21 +00:00
When compiling with DEBUG_THREADS, report the real file/func/line for ao2_lock/ao2_unlock
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@158539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user