kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-04 20:26:01 +00:00
Code Issues Projects Releases Wiki Activity

FS-11708 Fix deadlock on 'avmd uuid stop'

Browse Source
This commit is contained in:
Piotr Gregor 2019-03-15 16:49:29 +00:00 committed by Mike Jerris
parent 70dc40e680
commit c8e9eeaec9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_avmd/mod_avmd.c
View File

@ -644,11 +644,11 @@ static switch_bool_t avmd_callback(switch_media_bug_t * bug, void *user_data, sw
case SWITCH_ABC_TYPE_CLOSE: case SWITCH_ABC_TYPE_CLOSE:
avmd_session_close(avmd_session); avmd_session_close(avmd_session);
switch_mutex_lock(avmd_globals.mutex); switch_mutex_lock(avmd_globals.mutex);
if (avmd_globals.session_n > 0) { if (avmd_globals.session_n > 0) {
--avmd_globals.session_n; --avmd_globals.session_n;
} }
switch_mutex_unlock(avmd_globals.mutex); switch_mutex_unlock(avmd_globals.mutex);
break; break;
default: default:
@ -1151,7 +1151,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_avmd_load) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No memory pool assigned!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No memory pool assigned!\n");
return SWITCH_STATUS_TERM; return SWITCH_STATUS_TERM;
} }
switch_mutex_init(&avmd_globals.mutex, SWITCH_MUTEX_DEFAULT, pool); switch_mutex_init(&avmd_globals.mutex, SWITCH_MUTEX_NESTED, pool);
avmd_globals.pool = pool; avmd_globals.pool = pool;
if (avmd_load_xml_configuration(NULL) != SWITCH_STATUS_SUCCESS) { if (avmd_load_xml_configuration(NULL) != SWITCH_STATUS_SUCCESS) {