From 7117ad104575812d81db5b2439eefaa170d7d660 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 4 Nov 2008 19:02:21 +0000 Subject: [PATCH] Merged revisions 154264 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r154264 | tilghman | 2008-11-04 12:59:48 -0600 (Tue, 04 Nov 2008) | 10 lines Recorded merge of revisions 154263 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r154263 | tilghman | 2008-11-04 12:58:05 -0600 (Tue, 04 Nov 2008) | 3 lines 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.6.1@154267 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_h323.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 36cbb7958e..70f038716d 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -2604,7 +2604,7 @@ static int restart_monitor(void) pthread_kill(monitor_thread, SIGURG); } else { /* Start a new monitor */ - if (ast_pthread_create_detached_background(&monitor_thread, NULL, 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"); @@ -3302,8 +3302,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);