mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-09 11:28:25 +00:00
Cannot join detached threads. See http://www.opengroup.org/onlinepubs/000095399/functions/pthread_join.html
(Closes issue #13400) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3226,11 +3226,12 @@ static int unload_module(void)
|
|||||||
}
|
}
|
||||||
if (!ast_mutex_lock(&monlock)) {
|
if (!ast_mutex_lock(&monlock)) {
|
||||||
if ((monitor_thread != AST_PTHREADT_STOP) && (monitor_thread != AST_PTHREADT_NULL)) {
|
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_cancel(monitor_thread);
|
||||||
|
}
|
||||||
pthread_kill(monitor_thread, SIGURG);
|
pthread_kill(monitor_thread, SIGURG);
|
||||||
pthread_join(monitor_thread, NULL);
|
/* Cannot join detached threads */
|
||||||
|
/* pthread_join(monitor_thread, NULL); */
|
||||||
}
|
}
|
||||||
monitor_thread = AST_PTHREADT_STOP;
|
monitor_thread = AST_PTHREADT_STOP;
|
||||||
ast_mutex_unlock(&monlock);
|
ast_mutex_unlock(&monlock);
|
||||||
|
|||||||
Reference in New Issue
Block a user