[asterisk-commits] dhubbard: branch 1.2 r61777 - /branches/1.2/channels/

[asterisk-commits at lists.digium.com]

Author: dhubbard
Date: Tue Apr 24 13:20:31 2007
New Revision: 61777

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61777
Log:
removed #if 0 block from chan_phone, chan_zap, and chan_modem restart_monitor()

Modified:
    branches/1.2/channels/chan_modem.c
    branches/1.2/channels/chan_phone.c
    branches/1.2/channels/chan_zap.c

Modified: branches/1.2/channels/chan_modem.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_modem.c?view=diff&rev=61777&r1=61776&r2=61777
==============================================================================
--- branches/1.2/channels/chan_modem.c (original)
+++ branches/1.2/channels/chan_modem.c Tue Apr 24 13:20:31 2007
@@ -717,10 +717,8 @@
 		return -1;
 	}
 	if (monitor_thread != AST_PTHREADT_NULL) {
+		/* Wake up the thread */
 		pthread_kill(monitor_thread, SIGURG);
-#if 0
-		pthread_join(monitor_thread, NULL);
-#endif
 	} else {
 		/* Start a new monitor */
 		if (ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {

Modified: branches/1.2/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_phone.c?view=diff&rev=61777&r1=61776&r2=61777
==============================================================================
--- branches/1.2/channels/chan_phone.c (original)
+++ branches/1.2/channels/chan_phone.c Tue Apr 24 13:20:31 2007
@@ -1092,10 +1092,8 @@
 		  ast_log(LOG_WARNING, "Unable to lock the interface list\n");
 		  return -1;
 		}
+		/* Wake up the thread */
 		pthread_cancel(monitor_thread);
-#if 0
-		pthread_join(monitor_thread, NULL);
-#endif
 		ast_mutex_unlock(&iflock);
 	}
 	/* Start a new monitor */

Modified: branches/1.2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_zap.c?view=diff&rev=61777&r1=61776&r2=61777
==============================================================================
--- branches/1.2/channels/chan_zap.c (original)
+++ branches/1.2/channels/chan_zap.c Tue Apr 24 13:20:31 2007
@@ -6836,14 +6836,8 @@
 		return -1;
 	}
 	if (monitor_thread != AST_PTHREADT_NULL) {
-		/* Just signal it to be sure it wakes up */
-#if 0
-		pthread_cancel(monitor_thread);
-#endif
+		/* Wake up the thread */
 		pthread_kill(monitor_thread, SIGURG);
-#if 0
-		pthread_join(monitor_thread, NULL);
-#endif
 	} else {
 		/* Start a new monitor */
 		if (ast_pthread_create(&monitor_thread, &attr, do_monitor, NULL) < 0) {