[asterisk-commits] russell: branch 1.4 r94831 - /branches/1.4/main/pbx.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Dec 27 09:16:56 CST 2007


Author: russell
Date: Thu Dec 27 09:16:56 2007
New Revision: 94831

URL: http://svn.digium.com/view/asterisk?view=rev&rev=94831
Log:
Now that the contexts lock is a read/write lock, it should not be locked here
in ast_hint_state_changed().  This makes it get locked recursively which now
causes a deadlock.
(closes issue #11080, thanks to callguy for the access to a deadlocked machine)

Modified:
    branches/1.4/main/pbx.c

Modified: branches/1.4/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/pbx.c?view=diff&rev=94831&r1=94830&r2=94831
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Thu Dec 27 09:16:56 2007
@@ -2015,7 +2015,6 @@
 {
 	struct ast_hint *hint;
 
-	ast_rdlock_contexts();
 	AST_LIST_LOCK(&hints);
 
 	AST_LIST_TRAVERSE(&hints, hint, list) {
@@ -2053,7 +2052,6 @@
 	}
 
 	AST_LIST_UNLOCK(&hints);
-	ast_unlock_contexts();
 }
 
 /*! \brief  ast_extension_state_add: Add watcher for extension states */




More information about the asterisk-commits mailing list