kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-17 18:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed #if 0 block from chan_phone, chan_zap, and chan_modem restart_monitor()

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@61777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Dwayne M. Hubbard
2007-04-24 18:20:31 +00:00
parent 654c04bfc9
commit 1cde24d633
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_modem.c
View File

@@ -717,10 +717,8 @@ static int restart_monitor()
return -1;
}
if (monitor_thread != AST_PTHREADT_NULL) {
/* Wake up the thread */
pthread_kill(monitor_thread, SIGURG);
#if 0
pthread_join(monitor_thread, NULL);
#endif
} else {
/* Start a new monitor */
if (ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {

4
channels/chan_phone.c
View File

@@ -1092,10 +1092,8 @@ static int restart_monitor()
ast_log(LOG_WARNING, "Unable to lock the interface list\n");
return -1;
}
/* Wake up the thread */
pthread_cancel(monitor_thread);
#if 0
pthread_join(monitor_thread, NULL);
#endif
ast_mutex_unlock(&iflock);
}
/* Start a new monitor */

8
channels/chan_zap.c
View File

@@ -6836,14 +6836,8 @@ static int restart_monitor(void)
return -1;
}
if (monitor_thread != AST_PTHREADT_NULL) {
/* Just signal it to be sure it wakes up */
#if 0
pthread_cancel(monitor_thread);
#endif
/* Wake up the thread */
pthread_kill(monitor_thread, SIGURG);
#if 0
pthread_join(monitor_thread, NULL);
#endif
} else {
/* Start a new monitor */
if (ast_pthread_create(&monitor_thread, &attr, do_monitor, NULL) < 0) {