[svn-commits] mmichelson: branch mmichelson/lock_backtraces r115256 - in /team/mmichelson/l...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri May  2 15:22:19 2008
New Revision: 115256

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115256
Log:
I @&#^$ hate the utils directory. This fixes some of the linking errors. More to come.


Modified:
    team/mmichelson/lock_backtraces/include/asterisk/lock.h
    team/mmichelson/lock_backtraces/main/utils.c
    team/mmichelson/lock_backtraces/utils/check_expr.c
    team/mmichelson/lock_backtraces/utils/conf2ael.c

Modified: team/mmichelson/lock_backtraces/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/include/asterisk/lock.h?view=diff&rev=115256&r1=115255&r2=115256
==============================================================================
--- team/mmichelson/lock_backtraces/include/asterisk/lock.h (original)
+++ team/mmichelson/lock_backtraces/include/asterisk/lock.h Fri May  2 15:22:19 2008
@@ -110,9 +110,9 @@
 
 #include <errno.h>
 
-#define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, 1, { NULL }, { 0 }, 0, { NULL }, { 0 }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
+#define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, 1, { NULL }, { 0 }, 0, { NULL }, { 0 }, {{{ 0 }}}, PTHREAD_MUTEX_INIT_VALUE }
 #define AST_MUTEX_INIT_VALUE_NOTRACKING \
-                             { PTHREAD_MUTEX_INIT_VALUE, 0, { NULL }, { 0 }, 0, { NULL }, { 0 }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
+                             { PTHREAD_MUTEX_INIT_VALUE, 0, { NULL }, { 0 }, 0, { NULL }, { 0 }, {{{ 0 }}}, PTHREAD_MUTEX_INIT_VALUE }
 
 #define AST_MAX_REENTRANCY 10
 

Modified: team/mmichelson/lock_backtraces/main/utils.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/main/utils.c?view=diff&rev=115256&r1=115255&r2=115256
==============================================================================
--- team/mmichelson/lock_backtraces/main/utils.c (original)
+++ team/mmichelson/lock_backtraces/main/utils.c Fri May  2 15:22:19 2008
@@ -694,7 +694,7 @@
 		return;
 	}
 
-	ast_bt_destroy(lock_info[i].backtrace);
+	ast_bt_destroy(lock_info->locks[i].backtrace);
 
 	if (i < lock_info->num_locks - 1) {
 		/* Not the last one ... *should* be rare! */

Modified: team/mmichelson/lock_backtraces/utils/check_expr.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/utils/check_expr.c?view=diff&rev=115256&r1=115255&r2=115256
==============================================================================
--- team/mmichelson/lock_backtraces/utils/check_expr.c (original)
+++ team/mmichelson/lock_backtraces/utils/check_expr.c Fri May  2 15:22:19 2008
@@ -87,9 +87,9 @@
 #endif
 #if !defined(LOW_MEMORY)
 void ast_store_lock_info(enum ast_lock_type type, const char *filename,
-		        int line_num, const char *func, const char *lock_name, void *lock_addr);
+		        int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt);
 void ast_store_lock_info(enum ast_lock_type type, const char *filename,
-		        int line_num, const char *func, const char *lock_name, void *lock_addr)
+		        int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt)
 {
     /* not a lot to do in a standalone w/o threading! */
 }
@@ -100,8 +100,8 @@
     /* not a lot to do in a standalone w/o threading! */
 }
 
-void ast_remove_lock_info(void *lock_addr);
-void ast_remove_lock_info(void *lock_addr)
+void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt);
+void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
 {
     /* not a lot to do in a standalone w/o threading! */
 }

Modified: team/mmichelson/lock_backtraces/utils/conf2ael.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/utils/conf2ael.c?view=diff&rev=115256&r1=115255&r2=115256
==============================================================================
--- team/mmichelson/lock_backtraces/utils/conf2ael.c (original)
+++ team/mmichelson/lock_backtraces/utils/conf2ael.c Fri May  2 15:22:19 2008
@@ -706,12 +706,12 @@
 {
 }
 
-void ast_remove_lock_info(void *lock_addr)
+void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
 {
 }
 
 void ast_store_lock_info(enum ast_lock_type type, const char *filename,
-	int line_num, const char *func, const char *lock_name, void *lock_addr)
+	int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt)
 {
 }
 #endif