kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-6929 #resolve #comment fix deadlock in mod_rayo

This commit is contained in:
Chris Rienzo 2014-10-27 10:05:12 -04:00
parent 12b6940644
commit 57e8231cba
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/event_handlers/mod_rayo/mod_rayo.c
View File

@ -948,19 +948,20 @@ void rayo_actor_destroy(struct rayo_actor *actor, const char *file, int line)
} else { } else {
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Destroying %s\n", RAYO_JID(actor)); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Destroying %s\n", RAYO_JID(actor));
} }
switch_core_hash_delete(globals.destroy_actors, RAYO_JID(actor));
switch_mutex_unlock(globals.actors_mutex);
/* safe to destroy parent now */
if (actor->cleanup_fn) { if (actor->cleanup_fn) {
actor->cleanup_fn(actor); actor->cleanup_fn(actor);
} }
if (actor->parent) { if (actor->parent) {
/* safe to destroy parent now */
RAYO_RELEASE(actor->parent); RAYO_RELEASE(actor->parent);
} }
switch_core_hash_delete(globals.destroy_actors, RAYO_JID(actor));
switch_core_destroy_memory_pool(&pool); switch_core_destroy_memory_pool(&pool);
} else { } else {
switch_core_hash_insert(globals.destroy_actors, RAYO_JID(actor), actor); switch_core_hash_insert(globals.destroy_actors, RAYO_JID(actor), actor);
}
switch_mutex_unlock(globals.actors_mutex); switch_mutex_unlock(globals.actors_mutex);
}
} }
/** /**