sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "pbx_dundi.c: Handle thread shutdown better." into 16

This commit is contained in:
Joshua Colp 2018-08-21 18:53:01 -05:00 committed by Gerrit Code Review
parent b0db0df7b8 857926d197
commit 6b527d11ae
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pbx/pbx_dundi.c
View File

@ -2211,7 +2211,6 @@ static void *network_thread(void *ignore)
}
ast_io_remove(io, socket_read_id);
netthreadid = AST_PTHREADT_NULL;
return NULL;
}
@ -2246,7 +2245,6 @@ static void *process_clearcache(void *ignore)
pthread_testcancel();
}
clearcachethreadid = AST_PTHREADT_NULL;
return NULL;
}
@ -2282,8 +2280,6 @@ static void *process_precache(void *ign)
sleep(1);
}
precachethreadid = AST_PTHREADT_NULL;
return NULL;
}
@ -4986,8 +4982,6 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload)
static int unload_module(void)
{
pthread_t previous_netthreadid = netthreadid, previous_precachethreadid = precachethreadid, previous_clearcachethreadid = clearcachethreadid;
ast_cli_unregister_multiple(cli_dundi, ARRAY_LEN(cli_dundi));
ast_unregister_switch(&dundi_switch);
ast_custom_function_unregister(&dundi_function);
@ -4996,17 +4990,20 @@ static int unload_module(void)
/* Stop all currently running threads */
dundi_shutdown = 1;
if (previous_netthreadid != AST_PTHREADT_NULL) {
pthread_kill(previous_netthreadid, SIGURG);
pthread_join(previous_netthreadid, NULL);
if (netthreadid != AST_PTHREADT_NULL) {
pthread_kill(netthreadid, SIGURG);
pthread_join(netthreadid, NULL);
netthreadid = AST_PTHREADT_NULL;
}
if (previous_precachethreadid != AST_PTHREADT_NULL) {
pthread_kill(previous_precachethreadid, SIGURG);
pthread_join(previous_precachethreadid, NULL);
if (precachethreadid != AST_PTHREADT_NULL) {
pthread_kill(precachethreadid, SIGURG);
pthread_join(precachethreadid, NULL);
precachethreadid = AST_PTHREADT_NULL;
}
if (previous_clearcachethreadid != AST_PTHREADT_NULL) {
pthread_cancel(previous_clearcachethreadid);
pthread_join(previous_clearcachethreadid, NULL);
if (clearcachethreadid != AST_PTHREADT_NULL) {
pthread_cancel(clearcachethreadid);
pthread_join(clearcachethreadid, NULL);
clearcachethreadid = AST_PTHREADT_NULL;
}
mark_mappings();