diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:12:37 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:12:37 +0000 |
commit | 548100202dbb867a69ab7218cc9573f99e0f1ea9 (patch) | |
tree | 14de9b2345e4cc8c39c7d1d70d00804eeea4afe3 /main/astobj2.c | |
parent | 33703099db282a750d455b3061231c3e23aeeaf7 (diff) |
Merged revisions 158539 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r158539 | russell | 2008-11-21 16:05:55 -0600 (Fri, 21 Nov 2008) | 2 lines
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/trunk@158540 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/astobj2.c')
-rw-r--r-- | main/astobj2.c | 16 |
1 files changed, 16 insertions, 0 deletions
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) |