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

FS-6334 --resolve mod_rayo: deadlock when creating input voice component

This commit is contained in:
Chris Rienzo 2014-03-10 15:53:26 -04:00
parent 6ed4ad7e20
commit db22d28e21
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/event_handlers/mod_rayo/rayo_input_component.c
View File

@ -514,9 +514,13 @@ static iks *start_call_voice_input(struct input_component *component, switch_cor
/* start speech detection */ /* start speech detection */
switch_channel_set_variable(switch_core_session_get_channel(session), "fire_asr_events", "true"); switch_channel_set_variable(switch_core_session_get_channel(session), "fire_asr_events", "true");
switch_mutex_unlock(handler->mutex); /* unlock handler mutex, otherwise deadlock will happen when switch_ivr_detect_speech adds a new media bug */
if (switch_ivr_detect_speech(session, component->recognizer, grammar.data, "mod_rayo_grammar", "", NULL) != SWITCH_STATUS_SUCCESS) { if (switch_ivr_detect_speech(session, component->recognizer, grammar.data, "mod_rayo_grammar", "", NULL) != SWITCH_STATUS_SUCCESS) {
switch_mutex_lock(handler->mutex);
handler->voice_component = NULL; handler->voice_component = NULL;
rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_ERROR); rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_ERROR);
} else {
switch_mutex_lock(handler->mutex);
} }
switch_safe_free(grammar.data); switch_safe_free(grammar.data);