Fixup some pthread_t checking in channels
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2438 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
ecede97dc4
commit
66a2c925b5
|
@ -1271,7 +1271,7 @@ static int restart_monitor(void)
|
||||||
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP)) {
|
if (monitor_thread && (monitor_thread != AST_PTHREADT_NULL)) {
|
||||||
/* Wake up the thread */
|
/* Wake up the thread */
|
||||||
pthread_kill(monitor_thread, SIGURG);
|
pthread_kill(monitor_thread, SIGURG);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -2569,7 +2569,7 @@ static int restart_monitor(void)
|
||||||
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (monitor_thread) {
|
if (monitor_thread != AST_PTHREADT_NULL) {
|
||||||
/* Wake up the thread */
|
/* Wake up the thread */
|
||||||
pthread_kill(monitor_thread, SIGURG);
|
pthread_kill(monitor_thread, SIGURG);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -5829,7 +5829,7 @@ static int restart_monitor(void)
|
||||||
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (monitor_thread) {
|
if (monitor_thread != AST_PTHREADT_NULL) {
|
||||||
/* Wake up the thread */
|
/* Wake up the thread */
|
||||||
pthread_kill(monitor_thread, SIGURG);
|
pthread_kill(monitor_thread, SIGURG);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -2426,7 +2426,7 @@ static int restart_monitor(void)
|
||||||
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (monitor_thread) {
|
if (monitor_thread != AST_PTHREADT_NULL) {
|
||||||
/* Wake up the thread */
|
/* Wake up the thread */
|
||||||
pthread_kill(monitor_thread, SIGURG);
|
pthread_kill(monitor_thread, SIGURG);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1008,7 +1008,7 @@ static int restart_monitor(void)
|
||||||
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (monitor_thread) {
|
if (monitor_thread != AST_PTHREADT_NULL) {
|
||||||
/* Wake up the thread */
|
/* Wake up the thread */
|
||||||
pthread_kill(monitor_thread, SIGURG);
|
pthread_kill(monitor_thread, SIGURG);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -5182,7 +5182,7 @@ static int restart_monitor(void)
|
||||||
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
ast_log(LOG_WARNING, "Cannot kill myself\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (monitor_thread) {
|
if (monitor_thread != AST_PTHREADT_NULL) {
|
||||||
/* Just signal it to be sure it wakes up */
|
/* Just signal it to be sure it wakes up */
|
||||||
#if 0
|
#if 0
|
||||||
pthread_cancel(monitor_thread);
|
pthread_cancel(monitor_thread);
|
||||||
|
|
Reference in New Issue