[asterisk-commits] mmichelson: branch mmichelson/lock_backtraces r115347 - in /team/mmichelson/l...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue May  6 10:29:42 2008
New Revision: 115347

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115347
Log:
Compilation failed when I turned on DONT_OPTIMIZE, so I made some changes

1. ast_bt_get_addresses is no longer inlined
2. I added the crap necessary to files in the utils/ directory so they would compile

Also, while testing, I noticed that the core show locks output was redundant
so I removed an instance of append_backtrace_information.


Modified:
    team/mmichelson/lock_backtraces/include/asterisk/logger.h
    team/mmichelson/lock_backtraces/main/logger.c
    team/mmichelson/lock_backtraces/main/utils.c
    team/mmichelson/lock_backtraces/utils/hashtest.c
    team/mmichelson/lock_backtraces/utils/refcounter.c

Modified: team/mmichelson/lock_backtraces/include/asterisk/logger.h
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/include/asterisk/logger.h?view=diff&rev=115347&r1=115346&r2=115347
==============================================================================
--- team/mmichelson/lock_backtraces/include/asterisk/logger.h (original)
+++ team/mmichelson/lock_backtraces/include/asterisk/logger.h Tue May  6 10:29:42 2008
@@ -232,7 +232,7 @@
 
 struct ast_bt *ast_bt_create(void);
 
-inline int ast_bt_get_addresses(struct ast_bt *bt);
+int ast_bt_get_addresses(struct ast_bt *bt);
 
 void *ast_bt_destroy(struct ast_bt *bt);
 

Modified: team/mmichelson/lock_backtraces/main/logger.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/main/logger.c?view=diff&rev=115347&r1=115346&r2=115347
==============================================================================
--- team/mmichelson/lock_backtraces/main/logger.c (original)
+++ team/mmichelson/lock_backtraces/main/logger.c Tue May  6 10:29:42 2008
@@ -1154,7 +1154,7 @@
  * \retval 0 Success
  * \retval -1 Failure
  */
-inline int ast_bt_get_addresses(struct ast_bt *bt)
+int ast_bt_get_addresses(struct ast_bt *bt)
 {
 	bt->num_frames = backtrace(bt->addresses, AST_MAX_BT_FRAMES);
 

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=115347&r1=115346&r2=115347
==============================================================================
--- team/mmichelson/lock_backtraces/main/utils.c (original)
+++ team/mmichelson/lock_backtraces/main/utils.c Tue May  6 10:29:42 2008
@@ -770,7 +770,6 @@
 	for (j = 0; *str && j < lock->reentrancy; j++) {
 		ast_str_append(str, 0, "=== --- ---> Locked Here: %s line %d (%s)\n",
 					   lock->file[j], lock->lineno[j], lock->func[j]);
-		append_backtrace_information(str, lock_info->locks[i].backtrace);
 	}
 	ast_reentrancy_unlock(lock);	
 }

Modified: team/mmichelson/lock_backtraces/utils/hashtest.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/utils/hashtest.c?view=diff&rev=115347&r1=115346&r2=115347
==============================================================================
--- team/mmichelson/lock_backtraces/utils/hashtest.c (original)
+++ team/mmichelson/lock_backtraces/utils/hashtest.c Tue May  6 10:29:42 2008
@@ -366,3 +366,22 @@
 void ast_unregister_thread(void *id)
 {
 }
+
+struct ast_bt *ast_bt_create(void);
+struct ast_bt *ast_bt_create(void) 
+{
+	return NULL;
+}
+
+int ast_bt_get_addresses(struct ast_bt *bt);
+int ast_bt_get_addresses(struct ast_bt *bt)
+{
+	return 0;
+}
+
+void *ast_bt_destroy(struct ast_bt *bt);
+void *ast_bt_destroy(struct ast_bt *bt)
+{
+	return NULL;
+}
+

Modified: team/mmichelson/lock_backtraces/utils/refcounter.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/utils/refcounter.c?view=diff&rev=115347&r1=115346&r2=115347
==============================================================================
--- team/mmichelson/lock_backtraces/utils/refcounter.c (original)
+++ team/mmichelson/lock_backtraces/utils/refcounter.c Tue May  6 10:29:42 2008
@@ -266,3 +266,21 @@
 void ast_unregister_thread(void *id)
 {
 }
+struct ast_bt *ast_bt_create(void);
+struct ast_bt *ast_bt_create(void) 
+{
+	return NULL;
+}
+
+int ast_bt_get_addresses(struct ast_bt *bt);
+int ast_bt_get_addresses(struct ast_bt *bt)
+{
+	return 0;
+}
+
+void *ast_bt_destroy(struct ast_bt *bt);
+void *ast_bt_destroy(struct ast_bt *bt)
+{
+	return NULL;
+}
+