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

[SVN commits to the Asterisk project]

Author: mjordan
Date: Mon Nov 12 16:10:18 2012
New Revision: 376195

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=376195
Log:
Cut out the middle man

Modified:
    team/mjordan/trunk-deadlock/main/lock.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=376195&r1=376194&r2=376195
==============================================================================
--- team/mjordan/trunk-deadlock/main/lock.c (original)
+++ team/mjordan/trunk-deadlock/main/lock.c Mon Nov 12 16:10:18 2012
@@ -1001,7 +1001,7 @@
 
 	if (t->tracking) {
 #ifdef HAVE_BKTR
-		if (ast_reentrancy_lock(lt)) {
+		if (pthread_mutex_lock(&lt->reentr_mutex)) {
 			__dump_backtrace(&lt->backtrace[lt->reentrancy], 0);
 			abort();
 		}
@@ -1011,7 +1011,7 @@
 		lt->func[0] = func;
 		ast_bt_get_addresses(&lt->backtrace[0]);
 		bt = &lt->backtrace[0];
-		if (ast_reentrancy_unlock(lt)) {
+		if (pthread_mutex_unlock(&lt->reentr_mutex)) {
 			fprintf(stderr, "Original thread ID %lx\n", lt->thread[0]);
 			fprintf(stderr, "Current thread ID %lx\n", pthread_self());
 			fprintf(stderr, "Asterisk (crashing) pid: %ld\n", (long)getpid());