kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ABI differences that occured when compiling with DEBUG_THREADS.

Browse Source 
"Bad Things" would happen if Asterisk was compiled with DEBUG_THREADS, but a
loaded module was not (or vice versa).  This also immensely simplifies the
lock code, since there are no longer 2 separate versions of them.

Review: https://reviewboard.asterisk.org/r/508/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@258557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2010-04-22 19:08:01 +00:00
parent a753e8878b
commit 9e3f5fa6fb
8 changed files with 1517 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/astobj2.c
View File

@@ -143,11 +143,7 @@ static void *internal_ao2_callback(struct ao2_container *c,
char *tag, char *file, int line, const char *funcname);
static void *internal_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);
@@ -158,18 +154,10 @@ int __ao2_lock(void *user_data, const char *file, const char *func, int line, co
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);
@@ -180,29 +168,17 @@ int __ao2_unlock(void *user_data, const char *file, const char *func, int line,
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
}
#ifndef DEBUG_THREADS
int ao2_trylock(void *user_data)
#else
int __ao2_trylock(void *user_data, const char *file, const char *func, int line, const char *var)
#endif
{
struct astobj2 *p = INTERNAL_OBJ(user_data);
int ret;
if (p == NULL)
return -1;
#ifndef DEBUG_THREADS
ret = ast_mutex_trylock(&p->priv_data.lock);
#else
ret = __ast_pthread_mutex_trylock(file, line, func, var, &p->priv_data.lock);
#endif
#ifdef AO2_DEBUG
if (!ret)