diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:13:42 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 22:13:42 +0000 |
| commit | d0d333cc8bdb84ab7d0f0e65033fd783cccce0c5 (patch) | |
| tree | 491abd710f308eb4db4e3e6b0807f6d489ccefea /include | |
| parent | 2e223177ef84cc0767a4dc933c701b91402600ef (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.0@158542 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -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 5899885df..bb63496ca 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -192,7 +192,12 @@ int ao2_ref(void *o, int delta); * \param a A pointer to the object we want 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. @@ -200,7 +205,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 /*! * |