dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@154264 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2008-11-04 18:59:48 +00:00
parent cf7ea76646
commit fd4c3d29ad
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_h323.c
View File

@ -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");
@ -3320,8 +3320,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);

2
channels/chan_skinny.c
View File

@ -5917,7 +5917,7 @@ static void *accept_thread(void *ignore)
AST_LIST_INSERT_HEAD(&sessions, s, list);
AST_LIST_UNLOCK(&sessions);
if (ast_pthread_create_detached(&s->t, NULL, skinny_session, s)) {
if (ast_pthread_create(&s->t, NULL, skinny_session, s)) {
destroy_session(s);
}
}