[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r321561 - /team/irroot/distrot...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jun 2 11:06:11 CDT 2011


Author: irroot
Date: Thu Jun  2 11:06:05 2011
New Revision: 321561

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321561
Log:
Remove silly deadlock avoidance

Modified:
    team/irroot/distrotech-customers-1.8/main/pbx.c

Modified: team/irroot/distrotech-customers-1.8/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/main/pbx.c?view=diff&rev=321561&r1=321560&r2=321561
==============================================================================
--- team/irroot/distrotech-customers-1.8/main/pbx.c (original)
+++ team/irroot/distrotech-customers-1.8/main/pbx.c Thu Jun  2 11:06:05 2011
@@ -4283,11 +4283,8 @@
 
 		/* Device state changed since last check - notify the watchers */
 
-		while (ao2_trylock(hints)) {
-			ao2_unlock(hint);
-			usleep(1);
-			ao2_lock(hint);
-		}
+		ao2_lock(hints);
+		ao2_lock(hint);
 
 		if (hint->exten == NULL) {
 			/* the extension has been destroyed */




More information about the asterisk-commits mailing list