[asterisk-commits] moy: branch moy/mfcr2-1.4 r133395 - /team/moy/mfcr2-1.4/channels/chan_zap.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jul 24 00:08:27 CDT 2008


Author: moy
Date: Thu Jul 24 00:08:26 2008
New Revision: 133395

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133395
Log:
unlock the monitored_count_lock before quitting the monitor loop

Modified:
    team/moy/mfcr2-1.4/channels/chan_zap.c

Modified: team/moy/mfcr2-1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/channels/chan_zap.c?view=diff&rev=133395&r1=133394&r2=133395
==============================================================================
--- team/moy/mfcr2-1.4/channels/chan_zap.c (original)
+++ team/moy/mfcr2-1.4/channels/chan_zap.c Thu Jul 24 00:08:26 2008
@@ -8625,10 +8625,10 @@
 			pollers[i].events = POLLIN | POLLPRI;
 			pollers[i].fd = mfcr2->pvts[i]->subs[SUB_REAL].zfd;
 		}
+		ast_mutex_unlock(&mfcr2->monitored_count_lock);
 		if (quit_loop) {
 			break;
 		}
-		ast_mutex_unlock(&mfcr2->monitored_count_lock);
 		/* probably poll() is a valid cancel point, lets just be on the safe side
 		   by calling pthread_testcancel */
 		pthread_testcancel();
@@ -10822,6 +10822,7 @@
 
 	return zap_destroy_channel_bynum(channel);
 }
+
 static int setup_zap(int reload);
 static int zap_restart(void)
 {




More information about the asterisk-commits mailing list