diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:13:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:13:10 +0000 |
| commit | 015a498b47d3f4bddcac2115c563cf13bcddf423 (patch) | |
| tree | f53c721100c31ef65c3e265860f1c25081ea5fd0 /include/asterisk/astobj2.h | |
| parent | fed5d3596707964722484c079bcf58b85fcd2480 (diff) | |
Merged revisions 158540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r158540 | russell | 2008-11-21 16:12:37 -0600 (Fri, 21 Nov 2008) | 10 lines
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/branches/1.6.1@158541 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/astobj2.h')
| -rw-r--r-- | include/asterisk/astobj2.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index ec8e2c55e..542de44e0 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -452,7 +452,12 @@ int _ao2_ref(void *o, int delta); * \param a A pointer to the object we want to 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 /*! \brief * Unlock an object. @@ -460,7 +465,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 /*! \brief * Try locking-- (don't block if fail) |