kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-18 17:35:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

chan_iax2: Fix stray reference to worker thread idle_list.

Browse Source 
* Fix stray reference to idle_list in cleanup_thread_list().  This may be
the reason for the note in iax2_process_thread() about threads not being
removed from the task lists.

* Move cleanup_thread_list(&idle_list) to after the other lists are
cleaned up.
........

Merged revisions 398416 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 398417 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@398418 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-09-05 17:30:23 +00:00
parent 5d2ddbb701
commit 0f7dcdefa3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+5 -5
View File
@@ -11696,9 +11696,9 @@ static void *iax2_process_thread(void *data)
}
/*!
* \note For some reason, idle threads are exiting without being removed
* from an idle list, which is causing memory corruption. Forcibly remove
* it from the list, if it's there.
* \note For some reason, idle threads are exiting without being
* removed from an idle list, which is causing memory
* corruption. Forcibly remove it from the list, if it's there.
*/
AST_LIST_LOCK(&idle_list);
AST_LIST_REMOVE(&idle_list, thread, list);
@@ -14193,7 +14193,7 @@ static void cleanup_thread_list(void *head)
struct iax2_thread *thread;
AST_LIST_LOCK(list_head);
while ((thread = AST_LIST_REMOVE_HEAD(&idle_list, list))) {
while ((thread = AST_LIST_REMOVE_HEAD(list_head, list))) {
pthread_t thread_id = thread->threadid;
thread->stop = 1;
@@ -14236,9 +14236,9 @@ static int __unload_module(void)
}
/* Call for all threads to halt */
cleanup_thread_list(&idle_list);
cleanup_thread_list(&active_list);
cleanup_thread_list(&dynamic_list);
cleanup_thread_list(&idle_list);
ast_netsock_release(netsock);
ast_netsock_release(outsock);