dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 152958 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r152958 | tilghman | 2008-10-30 15:33:28 -0500 (Thu, 30 Oct 2008) | 3 lines
  
  Cannot join detached threads.  See http://www.opengroup.org/onlinepubs/000095399/functions/pthread_join.html
  (Closes issue #13400)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@152969 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2008-10-30 20:35:46 +00:00
parent ca1ba062f9
commit 91eb91bd9c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_h323.c
View File

@ -3316,11 +3316,12 @@ static int unload_module(void)
}
if (!ast_mutex_lock(&monlock)) {
if ((monitor_thread != AST_PTHREADT_STOP) && (monitor_thread != AST_PTHREADT_NULL)) {
/* this causes a seg, anyone know why? */
if (monitor_thread != pthread_self())
if (monitor_thread != pthread_self()) {
pthread_cancel(monitor_thread);
}
pthread_kill(monitor_thread, SIGURG);
pthread_join(monitor_thread, NULL);
/* Cannot join detached threads */
/* pthread_join(monitor_thread, NULL); */
}
monitor_thread = AST_PTHREADT_STOP;
ast_mutex_unlock(&monlock);