[asterisk-commits] mjordan: branch mjordan/trunk-deadlock r376585 - /team/mjordan/trunk-deadlock...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Nov 22 09:20:21 CST 2012


Author: mjordan
Date: Thu Nov 22 09:20:15 2012
New Revision: 376585

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=376585
Log:
Tweak how the mutex is re-initialized

Modified:
    team/mjordan/trunk-deadlock/main/lock.c
    team/mjordan/trunk-deadlock/main/logger.c

Modified: team/mjordan/trunk-deadlock/main/lock.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/trunk-deadlock/main/lock.c?view=diff&rev=376585&r1=376584&r2=376585
==============================================================================
--- team/mjordan/trunk-deadlock/main/lock.c (original)
+++ team/mjordan/trunk-deadlock/main/lock.c Thu Nov 22 09:20:15 2012
@@ -53,9 +53,6 @@
 
 #ifdef DEBUG_THREADS
 
-	if (t->track) {
-		delete_reentrancy_cs(&t->track);
-	}
 	t->track = NULL;
 
 #if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)

Modified: team/mjordan/trunk-deadlock/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/trunk-deadlock/main/logger.c?view=diff&rev=376585&r1=376584&r2=376585
==============================================================================
--- team/mjordan/trunk-deadlock/main/logger.c (original)
+++ team/mjordan/trunk-deadlock/main/logger.c Thu Nov 22 09:20:15 2012
@@ -1227,6 +1227,7 @@
 	sigaction(SIGXFSZ, &handle_SIGXFSZ, NULL);
 
 	/* re-initialize the logger mutex */
+	ast_mutex_destroy(&logmsgs.lock);
 	ast_mutex_init(&logmsgs.lock);
 
 	/* start logger thread */




More information about the asterisk-commits mailing list