kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 158539 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@158540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-11-21 22:12:37 +00:00
parent 3c01868040
commit 6fb1f86054
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/asterisk/astobj2.h
View File

@@ -452,7 +452,12 @@ int _ao2_ref(void *o, int delta);
* \param a A pointer to the object we want to lock. * \param a A pointer to the object we want to lock.
* \return 0 on success, other values on error. * \return 0 on success, other values on error.
*/ */
#ifndef DEBUG_THREADS
int ao2_lock(void *a); 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 /*! \brief
* Unlock an object. * Unlock an object.
@@ -460,7 +465,12 @@ int ao2_lock(void *a);
* \param a A pointer to the object we want unlock. * \param a A pointer to the object we want unlock.
* \return 0 on success, other values on error. * \return 0 on success, other values on error.
*/ */
#ifndef DEBUG_THREADS
int ao2_unlock(void *a); 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
/*! \brief /*! \brief
* Try locking-- (don't block if fail) * Try locking-- (don't block if fail)

16
main/astobj2.c
View File

@@ -139,7 +139,11 @@ static void *__ao2_callback(struct ao2_container *c,
char *tag, char *file, int line, const char *funcname); char *tag, char *file, int line, const char *funcname);
static void * __ao2_iterator_next(struct ao2_iterator *a, struct bucket_list **q); static void * __ao2_iterator_next(struct ao2_iterator *a, struct bucket_list **q);
#ifndef DEBUG_THREADS
int ao2_lock(void *user_data) 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); 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); ast_atomic_fetchadd_int(&ao2.total_locked, 1);
#endif #endif
#ifndef DEBUG_THREADS
return ast_mutex_lock(&p->priv_data.lock); 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) 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); 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); ast_atomic_fetchadd_int(&ao2.total_locked, -1);
#endif #endif
#ifndef DEBUG_THREADS
return ast_mutex_unlock(&p->priv_data.lock); 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) int ao2_trylock(void *user_data)