[asterisk-commits] mmichelson: branch mmichelson/lock_backtraces r115359 - /team/mmichelson/lock...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue May 6 13:23:37 CDT 2008
Author: mmichelson
Date: Tue May 6 13:23:36 2008
New Revision: 115359
URL: http://svn.digium.com/view/asterisk?view=rev&rev=115359
Log:
And now for that pesky utils directory
Modified:
team/mmichelson/lock_backtraces/utils/ael_main.c
team/mmichelson/lock_backtraces/utils/check_expr.c
team/mmichelson/lock_backtraces/utils/conf2ael.c
team/mmichelson/lock_backtraces/utils/hashtest.c
team/mmichelson/lock_backtraces/utils/hashtest2.c
team/mmichelson/lock_backtraces/utils/refcounter.c
Modified: team/mmichelson/lock_backtraces/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/utils/ael_main.c?view=diff&rev=115359&r1=115358&r2=115359
==============================================================================
--- team/mmichelson/lock_backtraces/utils/ael_main.c (original)
+++ team/mmichelson/lock_backtraces/utils/ael_main.c Tue May 6 13:23:36 2008
@@ -608,7 +608,7 @@
void ast_mark_lock_acquired(void *lock_addr)
{
}
-
+#ifdef HAVE_BKTR
void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
{
}
@@ -617,5 +617,15 @@
int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt)
{
}
-#endif
-#endif
+#else
+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)
+{
+}
+#endif /* HAVE_BKTR */
+#endif /* !defined(LOW_MEMORY) */
+#endif /* DEBUG_THREADS */
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=115359&r1=115358&r2=115359
==============================================================================
--- team/mmichelson/lock_backtraces/utils/check_expr.c (original)
+++ team/mmichelson/lock_backtraces/utils/check_expr.c Tue May 6 13:23:36 2008
@@ -86,6 +86,7 @@
};
#endif
#if !defined(LOW_MEMORY)
+#ifdef HAVE_BKTR
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, struct ast_bt *bt);
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
@@ -94,14 +95,29 @@
/* not a lot to do in a standalone w/o threading! */
}
+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! */
+}
+#else
+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);
+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)
+{
+ /* 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)
+{
+ /* not a lot to do in a standalone w/o threading! */
+}
+#endif /* HAVE_BKTR */
+
void ast_mark_lock_acquired(void *);
void ast_mark_lock_acquired(void *foo)
-{
- /* not a lot to do in a standalone w/o threading! */
-}
-
-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=115359&r1=115358&r2=115359
==============================================================================
--- team/mmichelson/lock_backtraces/utils/conf2ael.c (original)
+++ team/mmichelson/lock_backtraces/utils/conf2ael.c Tue May 6 13:23:36 2008
@@ -705,7 +705,7 @@
void ast_mark_lock_acquired(void *lock_addr)
{
}
-
+#ifdef HAVE_BKTR
void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
{
}
@@ -714,5 +714,15 @@
int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt)
{
}
-#endif
-#endif
+#else
+void ast_remove_lock_info(void *lock_addr)
+{
+}
+
+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)
+{
+}
+#endif /* HAVE_BKTR */
+#endif /* !defined(LOW_MEMORY) */
+#endif /* DEBUG_THREADS */
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=115359&r1=115358&r2=115359
==============================================================================
--- team/mmichelson/lock_backtraces/utils/hashtest.c (original)
+++ team/mmichelson/lock_backtraces/utils/hashtest.c Tue May 6 13:23:36 2008
@@ -367,6 +367,7 @@
{
}
+#ifdef HAVE_BKTR
struct ast_bt *ast_bt_create(void);
struct ast_bt *ast_bt_create(void)
{
@@ -384,4 +385,4 @@
{
return NULL;
}
-
+#endif
Modified: team/mmichelson/lock_backtraces/utils/hashtest2.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/lock_backtraces/utils/hashtest2.c?view=diff&rev=115359&r1=115358&r2=115359
==============================================================================
--- team/mmichelson/lock_backtraces/utils/hashtest2.c (original)
+++ team/mmichelson/lock_backtraces/utils/hashtest2.c Tue May 6 13:23:36 2008
@@ -379,6 +379,7 @@
{
}
+#ifdef HAVE_BKTR
struct ast_bt* ast_bt_create(void)
{
return NULL;
@@ -393,3 +394,4 @@
{
return NULL;
}
+#endif
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=115359&r1=115358&r2=115359
==============================================================================
--- team/mmichelson/lock_backtraces/utils/refcounter.c (original)
+++ team/mmichelson/lock_backtraces/utils/refcounter.c Tue May 6 13:23:36 2008
@@ -266,6 +266,7 @@
void ast_unregister_thread(void *id)
{
}
+#ifdef HAVE_BKTR
struct ast_bt *ast_bt_create(void);
struct ast_bt *ast_bt_create(void)
{
@@ -283,4 +284,4 @@
{
return NULL;
}
-
+#endif
More information about the asterisk-commits
mailing list