[asterisk-commits] russell: branch 1.6.0 r158542 - in /branches/1.6.0: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Nov 21 16:13:42 2008
New Revision: 158542

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158542
Log:
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/astobj2.h
    branches/1.6.0/main/astobj2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/astobj2.h?view=diff&rev=158542&r1=158541&r2=158542
==============================================================================
--- branches/1.6.0/include/asterisk/astobj2.h (original)
+++ branches/1.6.0/include/asterisk/astobj2.h Fri Nov 21 16:13:42 2008
@@ -192,7 +192,12 @@
  * \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 @@
  * \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
 
 /*! 
  *

Modified: branches/1.6.0/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/astobj2.c?view=diff&rev=158542&r1=158541&r2=158542
==============================================================================
--- branches/1.6.0/main/astobj2.c (original)
+++ branches/1.6.0/main/astobj2.c Fri Nov 21 16:13:42 2008
@@ -126,7 +126,11 @@
  */
 #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);
 
@@ -137,10 +141,18 @@
 	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);
 
@@ -151,7 +163,11 @@
 	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
 }
 
 /*