removed #if 0 block from chan_phone, chan_zap, and chan_modem restart_monitor()

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@61777 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index a77519324be30c251d8cfc2b356bf6c47183b7ab..d95d175bb90be1008a45ddbe56ab6152474fdc34 100644 (file)
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -717,10 +717,8 @@ static int restart_monitor()
                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) {

diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index ad7b8701309af552ec443d1e6d0f93a175a45454..669e87507d50e7e9844c092690de01662511d01b 100644 (file)
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -1092,10 +1092,8 @@ static int restart_monitor()
                  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 */

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index ab3e15ef7536a8fdb993937082f74de816ef5559..0de98e70b48228008d44d1b0cf6e172b0db51f1d 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6836,14 +6836,8 @@ static int restart_monitor(void)
                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) {