From b597520cb3698355fe982b46ec4f177915feb3e5 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 21 Nov 2008 22:13:10 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@158541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 include/asterisk/astobj2.h | 10 ++++++++++
 main/astobj2.c             | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index ec8e2c55e7..542de44e0a 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)
diff --git a/main/astobj2.c b/main/astobj2.c
index e12f00da0a..fc53dd7801 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -139,7 +139,11 @@ static void *__ao2_callback(struct ao2_container *c,
 					 char *tag, char *file, int line, const char *funcname);
 static void * __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);
 
@@ -150,10 +154,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);
 
@@ -164,7 +176,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
 }
 
 int ao2_trylock(void *user_data)