Make the monitor thread non-detached, so it can be joined (suggested by Russell

on -dev list).

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

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 4844c691cbcab13d1357b112f3bc1a5669d53b29..1199ddda9e4df010ea87bfc18b593ca796762409 100644 (file)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -2510,7 +2510,6 @@ restartsearch:
 
 static int restart_monitor(void)
 {
-       pthread_attr_t attr;
        /* If we're supposed to be stopped -- stay stopped */
        if (ast_mutex_lock(&monlock)) {
                ast_log(LOG_WARNING, "Unable to lock monitor\n");
@@ -2529,17 +2528,13 @@ static int restart_monitor(void)
                /* Wake up the thread */
                pthread_kill(monitor_thread, SIGURG);
        } else {
-               pthread_attr_init(&attr);
-               pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
                /* Start a new monitor */
-               if (ast_pthread_create_background(&monitor_thread, &attr, do_monitor, NULL) < 0) {
+               if (ast_pthread_create_background(&monitor_thread, NULL, do_monitor, NULL) < 0) {
                        monitor_thread = AST_PTHREADT_NULL;
                        ast_mutex_unlock(&monlock);
                        ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
-                       pthread_attr_destroy(&attr);
                        return -1;
                }
-               pthread_attr_destroy(&attr);
        }
        ast_mutex_unlock(&monlock);
        return 0;
@@ -3230,8 +3225,7 @@ static int unload_module(void)
                                pthread_cancel(monitor_thread);
                        }
                        pthread_kill(monitor_thread, SIGURG);
-                       /* Cannot join detached threads */
-                       /* pthread_join(monitor_thread, NULL); */
+                       pthread_join(monitor_thread, NULL);
                }
                monitor_thread = AST_PTHREADT_STOP;
                ast_mutex_unlock(&monlock);