kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safely traverse the thread lists and wait until each thread is done before moving on to the next.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-05-25 16:14:17 +00:00
parent 336fd1a2de
commit e0612c9835
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
channels/chan_iax2.c
View File

@@ -7732,7 +7732,6 @@ static void *iax2_process_thread(void *data)
ast_mutex_destroy(&thread->lock); ast_mutex_destroy(&thread->lock);
ast_cond_destroy(&thread->cond); ast_cond_destroy(&thread->cond);
free(thread); free(thread);
thread = NULL;
return NULL; return NULL;
} }
@@ -8642,7 +8641,6 @@ static void delete_users(void)
AST_LIST_TRAVERSE(&peers, peer, entry) AST_LIST_TRAVERSE(&peers, peer, entry)
ast_set_flag(peer, IAX_DELME); ast_set_flag(peer, IAX_DELME);
AST_LIST_UNLOCK(&peers); AST_LIST_UNLOCK(&peers);
} }
static void destroy_user(struct iax2_user *user) static void destroy_user(struct iax2_user *user)
@@ -9681,6 +9679,7 @@ static struct ast_cli_entry iax2_cli[] = {
static int __unload_module(void) static int __unload_module(void)
{ {
pthread_t threadid = AST_PTHREADT_NULL;
struct iax2_thread *thread = NULL; struct iax2_thread *thread = NULL;
int x; int x;
@@ -9700,24 +9699,36 @@ static int __unload_module(void)
/* Call for all threads to halt */ /* Call for all threads to halt */
AST_LIST_LOCK(&idle_list); AST_LIST_LOCK(&idle_list);
AST_LIST_TRAVERSE(&idle_list, thread, list) { AST_LIST_TRAVERSE_SAFE_BEGIN(&idle_list, thread, list) {
AST_LIST_REMOVE_CURRENT(&idle_list, list);
threadid = thread->threadid;
thread->halt = 1; thread->halt = 1;
signal_condition(&thread->lock, &thread->cond); signal_condition(&thread->lock, &thread->cond);
pthread_join(threadid, NULL);
} }
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&idle_list); AST_LIST_UNLOCK(&idle_list);
AST_LIST_LOCK(&active_list); AST_LIST_LOCK(&active_list);
AST_LIST_TRAVERSE(&active_list, thread, list) { AST_LIST_TRAVERSE_SAFE_BEGIN(&active_list, thread, list) {
AST_LIST_REMOVE_CURRENT(&active_list, list);
threadid = thread->threadid;
thread->halt = 1; thread->halt = 1;
signal_condition(&thread->lock, &thread->cond); signal_condition(&thread->lock, &thread->cond);
pthread_join(threadid, NULL);
} }
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&active_list); AST_LIST_UNLOCK(&active_list);
AST_LIST_LOCK(&dynamic_list); AST_LIST_LOCK(&dynamic_list);
AST_LIST_TRAVERSE(&dynamic_list, thread, list) { AST_LIST_TRAVERSE_SAFE_BEGIN(&dynamic_list, thread, list) {
AST_LIST_REMOVE_CURRENT(&dynamic_list, list);
threadid = thread->threadid;
thread->halt = 1; thread->halt = 1;
signal_condition(&thread->lock, &thread->cond); signal_condition(&thread->lock, &thread->cond);
pthread_join(threadid, NULL);
} }
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&dynamic_list); AST_LIST_UNLOCK(&dynamic_list);
ast_netsock_release(netsock); ast_netsock_release(netsock);