[asterisk-commits] dlee: branch dlee/ASTERISK-194630-startup-deadlock r398756 - in /team/dlee/AS...

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Sep 10 12:53:46 2013
New Revision: 398756

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398756
Log:
Multiple revisions 398748,398752

........
  r398748 | dlee | 2013-09-10 12:22:23 -0500 (Tue, 10 Sep 2013) | 1 line
  
  Fixed utils directory breakage from r398648
........
  r398752 | dlee | 2013-09-10 12:47:59 -0500 (Tue, 10 Sep 2013) | 1 line
  
  Fixed utils directory breakage from r398748, this time with extra hate.
........

Merged revisions 398748,398752 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    team/dlee/ASTERISK-194630-startup-deadlock/   (props changed)
    team/dlee/ASTERISK-194630-startup-deadlock/utils/ael_main.c
    team/dlee/ASTERISK-194630-startup-deadlock/utils/check_expr.c
    team/dlee/ASTERISK-194630-startup-deadlock/utils/conf2ael.c

Propchange: team/dlee/ASTERISK-194630-startup-deadlock/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 10 12:53:46 2013
@@ -1,1 +1,1 @@
-/branches/1.8:1-398746
+/branches/1.8:1-398755

Modified: team/dlee/ASTERISK-194630-startup-deadlock/utils/ael_main.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-194630-startup-deadlock/utils/ael_main.c?view=diff&rev=398756&r1=398755&r2=398756
==============================================================================
--- team/dlee/ASTERISK-194630-startup-deadlock/utils/ael_main.c (original)
+++ team/dlee/ASTERISK-194630-startup-deadlock/utils/ael_main.c Tue Sep 10 12:53:46 2013
@@ -647,5 +647,11 @@
 {
 }
 #endif /* HAVE_BKTR */
+void ast_suspend_lock_info(void *lock_addr)
+{
+}
+void ast_restore_lock_info(void *lock_addr)
+{
+}
 #endif /* !defined(LOW_MEMORY) */
 #endif /* DEBUG_THREADS */

Modified: team/dlee/ASTERISK-194630-startup-deadlock/utils/check_expr.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-194630-startup-deadlock/utils/check_expr.c?view=diff&rev=398756&r1=398755&r2=398756
==============================================================================
--- team/dlee/ASTERISK-194630-startup-deadlock/utils/check_expr.c (original)
+++ team/dlee/ASTERISK-194630-startup-deadlock/utils/check_expr.c Tue Sep 10 12:53:46 2013
@@ -55,6 +55,7 @@
 }
 #endif
 
+#ifdef DEBUG_THREADS
 #if !defined(LOW_MEMORY)
 #ifdef HAVE_BKTR
 void ast_store_lock_info(enum ast_lock_type type, const char *filename,
@@ -105,12 +106,20 @@
 }
 #endif /* HAVE_BKTR */
 
+void ast_suspend_lock_info(void *lock_addr)
+{
+}
+void ast_restore_lock_info(void *lock_addr)
+{
+}
 void ast_mark_lock_acquired(void *);
 void ast_mark_lock_acquired(void *foo)
 {
     /* not a lot to do in a standalone w/o threading! */
 }
 #endif
+#endif /* DEBUG_THREADS */
+
 
 static int global_lineno = 1;
 static int global_expr_count=0;

Modified: team/dlee/ASTERISK-194630-startup-deadlock/utils/conf2ael.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-194630-startup-deadlock/utils/conf2ael.c?view=diff&rev=398756&r1=398755&r2=398756
==============================================================================
--- team/dlee/ASTERISK-194630-startup-deadlock/utils/conf2ael.c (original)
+++ team/dlee/ASTERISK-194630-startup-deadlock/utils/conf2ael.c Tue Sep 10 12:53:46 2013
@@ -777,5 +777,11 @@
 {
 }
 #endif /* HAVE_BKTR */
+void ast_suspend_lock_info(void *lock_addr)
+{
+}
+void ast_restore_lock_info(void *lock_addr)
+{
+}
 #endif /* !defined(LOW_MEMORY) */
 #endif /* DEBUG_THREADS */