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/branches/1.4@158539 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index ca05141b5fd647f312a02cd62c3fae7285132a76..87c7f7353f32b3fd91f467bb704e1b1e4d3146f9 100644 (file)
--- a/include/asterisk/astobj2.h
+++ b/include/asterisk/astobj2.h
@@ -185,7 +185,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
 
 /*!
  * Unlock an object.
@@ -193,7 +198,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
 
 /*!
  *

diff --git a/main/astobj2.c b/main/astobj2.c
index bcf34556e6e56144cf878e247cd60938b89ada90..2614cf7b41307b4aba5c2e807604769a43997b1c 100644 (file)
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -125,7 +125,11 @@ static inline struct astobj2 *INTERNAL_OBJ(void *user_data)
  */
 #define EXTERNAL_OBJ(_p)       ((_p) == NULL ? NULL : (_p)->user_data)
 
+#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);
 
@@ -136,10 +140,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);
 
@@ -150,7 +162,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
 }
 
 /*