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

Fix infinite looping and crash problem.

Browse Source 
MALLOC_DEBUG is complaining about corrupted memory on taskprocessor
listeners, but I'm not seeing it, nor is valgrind. Not sure what's up
there.



git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2012-12-07 19:05:30 +00:00
parent ec29862a92
commit 3a25935f7d
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/taskprocessor.c
View File

@@ -581,8 +581,6 @@ struct ast_taskprocessor *ast_taskprocessor_create_with_listener(const char *nam
/* decrement the taskprocessor reference count and unlink from the container if necessary */
void *ast_taskprocessor_unreference(struct ast_taskprocessor *tps)
{
struct ast_taskprocessor_listener *listener;
if (!tps) {
return NULL;
}
@@ -596,10 +594,7 @@ void *ast_taskprocessor_unreference(struct ast_taskprocessor *tps)
* 3. The listener
*/
ao2_unlink(tps_singletons, tps);
listener = tps->listener;
tps->listener = NULL;
listener_shutdown(listener);
ao2_ref(listener, -1);
listener_shutdown(tps->listener);
return NULL;
}

2
main/threadpool.c
View File

@@ -784,7 +784,7 @@ static void worker_active(struct worker_thread *worker)
{
int alive = 1;
while (alive) {
if (threadpool_execute(worker->pool)) {
if (threadpool_execute(worker->pool) == 0) {
alive = worker_idle(worker);
}
}