- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5642 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 18:09:02 2007 New Revision: 5642 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: fix compile error Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 18:09:02 2007 @@ -508,7 +508,7 @@ } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No result received from mrcp server: %s"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No result received from mrcp server"); ret = SWITCH_STATUS_FALSE; }

1 0

[commit] r5641 - in freeswitch/branches/greenlizard/src: . mod/asr_tts/mod_openmrcp mod/timers/mod_softtimer
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 18:01:13 2007 New Revision: 5641 Modified: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/branches/greenlizard/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/branches/greenlizard/src/switch_loadable_module.c Log: merge trunk 5627:5639 Modified: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 18:01:13 2007 @@ -99,7 +99,8 @@ FLAG_BARGE = (1 << 1), FLAG_READY = (1 << 2), FLAG_SPEAK_COMPLETE = (1 << 3), - FLAG_FEED_STARTED = (1 << 4) + FLAG_FEED_STARTED = (1 << 4), + FLAG_TERMINATING = (1 << 5) } mrcp_flag_t; typedef struct { @@ -173,7 +174,13 @@ if(!openmrcp_session) { return MRCP_STATUS_FAILURE; } - openmrcp_session_destroy(openmrcp_session); + + if (switch_test_flag(openmrcp_session, FLAG_TERMINATING)) { + openmrcp_session_destroy(openmrcp_session); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "abnormal session terminate\n"); + } return MRCP_STATUS_SUCCESS; } @@ -436,6 +443,7 @@ // terminate client session switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to TERMINATE SESSION\n"); + switch_set_flag_locked(asr_session, FLAG_TERMINATING); mrcp_client_context_session_terminate(context, asr_session->client_session); switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); @@ -487,15 +495,21 @@ </result> */ - char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. - char *position = strstr(asr_session->mrcp_message_last_rcvd->body, marker); - if (!position) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", asr_session->mrcp_message_last_rcvd->body); - ret = SWITCH_STATUS_FALSE; + if(asr_session->mrcp_message_last_rcvd && asr_session->mrcp_message_last_rcvd->body) { + char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. + char *position = strstr(asr_session->mrcp_message_last_rcvd->body, marker); + if (!position) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", asr_session->mrcp_message_last_rcvd->body); + ret = SWITCH_STATUS_FALSE; + } + else { + position += strlen(marker); + *xmlstr = strdup(position); + } } else { - position += strlen(marker); - *xmlstr = strdup(position); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No result received from mrcp server"); + ret = SWITCH_STATUS_FALSE; } // since we are returning our result here, future calls to check_results @@ -599,6 +613,7 @@ /* terminate tts session */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "terminate tts_session\n"); + switch_set_flag_locked(tts_session, FLAG_TERMINATING); mrcp_client_context_session_terminate(context,tts_session->client_session); return SWITCH_STATUS_SUCCESS; } @@ -705,6 +720,7 @@ return SWITCH_STATUS_TERM; } + mrcp_logger.priority = MRCP_PRIO_EMERGENCY; if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { const char *var = switch_xml_attr_soft(param, "name"); @@ -714,6 +730,8 @@ asr_profile_name = val; } else if (!strcasecmp(var, "tts_default_profile")) { tts_profile_name = val; + } else if (!strcasecmp(var, "log_level")) { + mrcp_logger.priority = atoi(val); } } } Modified: freeswitch/branches/greenlizard/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/branches/greenlizard/src/mod/timers/mod_softtimer/mod_softtimer.c Mon Aug 20 18:01:13 2007 @@ -74,7 +74,7 @@ #define IDLE_SPEED 100 -static inline switch_status_t timer_init(switch_timer_t *timer) +static switch_status_t timer_init(switch_timer_t *timer) { timer_private_t *private_info; int sanity = 0; @@ -112,7 +112,7 @@ -static inline switch_status_t timer_step(switch_timer_t *timer) +static switch_status_t timer_step(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; uint64_t samples; @@ -136,7 +136,7 @@ } -static inline switch_status_t timer_next(switch_timer_t *timer) +static switch_status_t timer_next(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; @@ -154,7 +154,7 @@ return SWITCH_STATUS_FALSE; } -static inline switch_status_t timer_check(switch_timer_t *timer) +static switch_status_t timer_check(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -182,7 +182,7 @@ } -static inline switch_status_t timer_destroy(switch_timer_t *timer) +static switch_status_t timer_destroy(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; switch_mutex_lock(globals.mutex); Modified: freeswitch/branches/greenlizard/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_loadable_module.c (original) +++ freeswitch/branches/greenlizard/src/switch_loadable_module.c Mon Aug 20 18:01:13 2007 @@ -1047,6 +1047,7 @@ assert(module != NULL); switch_loadable_module_unprocess(module); + switch_core_hash_delete_locked(loadable_modules.module_hash, module->key, loadable_modules.mutex); if (module->switch_module_shutdown) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping: %s\n", module->module_interface->module_name); @@ -1067,7 +1068,7 @@ } - switch_core_hash_delete_locked(loadable_modules.module_hash, module->key, loadable_modules.mutex); + }

1 0

[commit] r5640 - freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 17:54:21 2007 New Revision: 5640 Modified: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: attempting to fix shutdown segfault, convert to new style module loading as seen in mod_cepstral Modified: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 17:54:21 2007 @@ -690,47 +690,6 @@ } -static switch_asr_interface_t openmrcp_asr_interface = { - /*.interface_name*/ "openmrcp", - /*.asr_open*/ openmrcp_asr_open, - /*.asr_load_grammar*/ openmrcp_asr_load_grammar, - /*.asr_unload_grammar*/ openmrcp_asr_unload_grammar, - /*.asr_close*/ openmrcp_asr_close, - /*.asr_feed*/ openmrcp_asr_feed, - /*.asr_resume*/ openmrcp_asr_resume, - /*.asr_pause*/ openmrcp_asr_pause, - /*.asr_check_results*/ openmrcp_asr_check_results, - /*.asr_get_results*/ openmrcp_asr_get_results -}; - -static switch_speech_interface_t openmrcp_tts_interface = { - /*.interface_name*/ "openmrcp", - /*.speech_open*/ openmrcp_tts_open, - /*.speech_close*/ openmrcp_tts_close, - /*.speech_feed_tts*/ openmrcp_feed_tts, - /*.speech_read_tts*/ openmrcp_read_tts, - /*.speech_flush_tts*/ openmrcp_flush_tts, - /*.speech_text_param_tts*/ openmrcp_text_param_tts, - /*.speech_numeric_param_tts*/ openmrcp_numeric_param_tts, - /*.speech_float_param_tts*/ openmrcp_float_param_tts, -}; - -static switch_loadable_module_interface_t openmrcp_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ NULL, - /*.application_interface */ NULL, - /*.api_interface */ NULL, - /*.file_interface */ NULL, - /*.speech_interface */ &openmrcp_tts_interface, - /*.directory_interface */ NULL, - /*.chat_interface */ NULL, - /*.say_interface */ NULL, - /*.asr_interface */ &openmrcp_asr_interface -}; - static switch_status_t do_config() { @@ -903,7 +862,34 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_openmrcp_load) { /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &openmrcp_module_interface; + //*module_interface = &openmrcp_module_interface; + + switch_speech_interface_t *speech_interface; + switch_asr_interface_t *asr_interface; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + speech_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SPEECH_INTERFACE); + speech_interface->interface_name = "openmrcp"; + speech_interface->speech_open = openmrcp_tts_open; + speech_interface->speech_close = openmrcp_tts_close; + speech_interface->speech_feed_tts = openmrcp_feed_tts; + speech_interface->speech_read_tts = openmrcp_read_tts; + speech_interface->speech_flush_tts = openmrcp_flush_tts; + speech_interface->speech_text_param_tts = openmrcp_text_param_tts; + speech_interface->speech_numeric_param_tts = openmrcp_numeric_param_tts; + speech_interface->speech_float_param_tts = openmrcp_float_param_tts; + asr_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ASR_INTERFACE); + asr_interface->interface_name = "openmrcp"; + asr_interface->asr_open = openmrcp_asr_open; + asr_interface->asr_load_grammar = openmrcp_asr_load_grammar; + asr_interface->asr_unload_grammar = openmrcp_asr_unload_grammar; + asr_interface->asr_close = openmrcp_asr_close; + asr_interface->asr_feed = openmrcp_asr_feed; + asr_interface->asr_resume = openmrcp_asr_resume; + asr_interface->asr_pause = openmrcp_asr_pause; + asr_interface->asr_check_results = openmrcp_asr_check_results; + asr_interface->asr_get_results = openmrcp_asr_get_results; mrcp_global_init();

1 0

[commit] r5639 - freeswitch/trunk/src
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: anthm Date: Mon Aug 20 17:25:06 2007 New Revision: 5639 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: tweak Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Aug 20 17:25:06 2007 @@ -1047,6 +1047,7 @@ assert(module != NULL); switch_loadable_module_unprocess(module); + switch_core_hash_delete_locked(loadable_modules.module_hash, module->key, loadable_modules.mutex); if (module->switch_module_shutdown) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping: %s\n", module->module_interface->module_name); @@ -1067,7 +1068,7 @@ } - switch_core_hash_delete_locked(loadable_modules.module_hash, module->key, loadable_modules.mutex); + }

1 0

[commit] r5638 - freeswitch/trunk/src
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 16:02:14 2007 New Revision: 5638 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: did not have a return value and was breaking on windows build Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Aug 20 16:02:14 2007 @@ -165,6 +165,7 @@ begin_allow_threads(); switch_ivr_collect_digits_callback(session, ap, timeout); end_allow_threads(); + return SWITCH_STATUS_SUCCESS; } int CoreSession::getDigits(char *dtmf_buf,

1 0

[commit] r5637 - freeswitch/branches/greenlizard/src
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 15:59:51 2007 New Revision: 5637 Modified: freeswitch/branches/greenlizard/src/switch_cpp.cpp Log: did not have a return value and was breaking on windows build Modified: freeswitch/branches/greenlizard/src/switch_cpp.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/switch_cpp.cpp (original) +++ freeswitch/branches/greenlizard/src/switch_cpp.cpp Mon Aug 20 15:59:51 2007 @@ -165,6 +165,7 @@ begin_allow_threads(); switch_ivr_collect_digits_callback(session, ap, timeout); end_allow_threads(); + return SWITCH_STATUS_SUCCESS; } int CoreSession::getDigits(char *dtmf_buf,

1 0

[commit] r5636 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 15:25:59 2007 New Revision: 5636 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: set the highest (disable) mrcp log priority by default; log priority can be changed from mod_openmrcp.conf.xml->settings->log_level=7 [0-7] Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 15:25:59 2007 @@ -761,6 +761,7 @@ return SWITCH_STATUS_TERM; } + mrcp_logger.priority = MRCP_PRIO_EMERGENCY; if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { const char *var = switch_xml_attr_soft(param, "name"); @@ -770,6 +771,8 @@ asr_profile_name = val; } else if (!strcasecmp(var, "tts_default_profile")) { tts_profile_name = val; + } else if (!strcasecmp(var, "log_level")) { + mrcp_logger.priority = atoi(val); } } }

1 0

[commit] r5635 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 15:09:19 2007 New Revision: 5635 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: add FLAG_TERMINATING to trigger normal and unexpected (abnormal) session termination Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 15:09:19 2007 @@ -99,7 +99,8 @@ FLAG_BARGE = (1 << 1), FLAG_READY = (1 << 2), FLAG_SPEAK_COMPLETE = (1 << 3), - FLAG_FEED_STARTED = (1 << 4) + FLAG_FEED_STARTED = (1 << 4), + FLAG_TERMINATING = (1 << 5) } mrcp_flag_t; typedef struct { @@ -173,7 +174,13 @@ if(!openmrcp_session) { return MRCP_STATUS_FAILURE; } - openmrcp_session_destroy(openmrcp_session); + + if (switch_test_flag(openmrcp_session, FLAG_TERMINATING)) { + openmrcp_session_destroy(openmrcp_session); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "abnormal session terminate\n"); + } return MRCP_STATUS_SUCCESS; } @@ -436,6 +443,7 @@ // terminate client session switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to TERMINATE SESSION\n"); + switch_set_flag_locked(asr_session, FLAG_TERMINATING); mrcp_client_context_session_terminate(context, asr_session->client_session); switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); @@ -605,6 +613,7 @@ /* terminate tts session */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "terminate tts_session\n"); + switch_set_flag_locked(tts_session, FLAG_TERMINATING); mrcp_client_context_session_terminate(context,tts_session->client_session); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r5633 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 14:10:00 2007 New Revision: 5633 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: asr result in mrcp message body must be checked to exist before use Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 14:10:00 2007 @@ -487,15 +487,21 @@ </result> */ - char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. - char *position = strstr(asr_session->mrcp_message_last_rcvd->body, marker); - if (!position) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", asr_session->mrcp_message_last_rcvd->body); - ret = SWITCH_STATUS_FALSE; + if(asr_session->mrcp_message_last_rcvd && asr_session->mrcp_message_last_rcvd->body) { + char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. + char *position = strstr(asr_session->mrcp_message_last_rcvd->body, marker); + if (!position) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", asr_session->mrcp_message_last_rcvd->body); + ret = SWITCH_STATUS_FALSE; + } + else { + position += strlen(marker); + *xmlstr = strdup(position); + } } else { - position += strlen(marker); - *xmlstr = strdup(position); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No result received from mrcp server: %s"); + ret = SWITCH_STATUS_FALSE; } // since we are returning our result here, future calls to check_results

1 0

[commit] r5632 - freeswitch/trunk/src/mod/timers/mod_softtimer
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: anthm Date: Mon Aug 20 14:06:08 2007 New Revision: 5632 Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Log: remove inline from timer to avoid unhappyness Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Mon Aug 20 14:06:08 2007 @@ -74,7 +74,7 @@ #define IDLE_SPEED 100 -static inline switch_status_t timer_init(switch_timer_t *timer) +static switch_status_t timer_init(switch_timer_t *timer) { timer_private_t *private_info; int sanity = 0; @@ -112,7 +112,7 @@ -static inline switch_status_t timer_step(switch_timer_t *timer) +static switch_status_t timer_step(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; uint64_t samples; @@ -136,7 +136,7 @@ } -static inline switch_status_t timer_next(switch_timer_t *timer) +static switch_status_t timer_next(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; @@ -154,7 +154,7 @@ return SWITCH_STATUS_FALSE; } -static inline switch_status_t timer_check(switch_timer_t *timer) +static switch_status_t timer_check(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -182,7 +182,7 @@ } -static inline switch_status_t timer_destroy(switch_timer_t *timer) +static switch_status_t timer_destroy(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; switch_mutex_lock(globals.mutex);

1 0