[asterisk-commits] mmichelson: trunk r89483 - /trunk/main/pbx.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Nov 21 10:08:12 2007
New Revision: 89483

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89483
Log:
I introduced a deadlock avoidance into 1.4, which I attempted to port to trunk as well.
Unfortunately, since trunk uses read/write locks for the context lock, it means that I have
actually *introduced* a deadlock condition since they are not recursive. Removing this change
for now and will look into introducing a different one.


Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=89483&r1=89482&r2=89483
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Nov 21 10:08:12 2007
@@ -2722,7 +2722,6 @@
 {
 	struct ast_hint *hint;
 
-	ast_rdlock_contexts();
 	AST_RWLIST_RDLOCK(&hints);
 
 	AST_RWLIST_TRAVERSE(&hints, hint, list) {
@@ -2760,7 +2759,6 @@
 	}
 
 	AST_RWLIST_UNLOCK(&hints);
-	ast_unlock_contexts();
 }
 
 static int statechange_queue(const char *dev)