- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12544 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 17:51:31 2009 New Revision: 12544 Log: declinatio mortuus obfirmo in fsctl hupall Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Mar 9 17:51:31 2009 @@ -81,6 +81,12 @@ switch_hash_index_t *hi; void *val; switch_core_session_t *session; + switch_memory_pool_t *pool; + switch_queue_t *queue; + void *pop; + + switch_core_new_memory_pool(&pool); + switch_queue_create(&queue, 250000, pool); if (!var_val) return; @@ -93,13 +99,25 @@ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { if (switch_channel_up(session->channel) && (this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) { - switch_channel_hangup(session->channel, cause); + switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str)); } switch_core_session_rwunlock(session); } } } switch_mutex_unlock(runtime.session_hash_mutex); + + while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + char *uuid = (char *) pop; + + if ((session = switch_core_session_locate(uuid))) { + switch_channel_hangup(session->channel, cause); + switch_core_session_rwunlock(session); + } + } + + switch_core_destroy_memory_pool(&pool); + } SWITCH_DECLARE(void) switch_core_session_hupall_endpoint(const switch_endpoint_interface_t *endpoint_interface, switch_call_cause_t cause) @@ -107,6 +125,12 @@ switch_hash_index_t *hi; void *val; switch_core_session_t *session; + switch_memory_pool_t *pool; + switch_queue_t *queue; + void *pop; + + switch_core_new_memory_pool(&pool); + switch_queue_create(&queue, 250000, pool); switch_mutex_lock(runtime.session_hash_mutex); for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { @@ -115,13 +139,25 @@ session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { if (session->endpoint_interface == endpoint_interface) { - switch_channel_hangup(switch_core_session_get_channel(session), cause); + switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str)); } switch_core_session_rwunlock(session); } } } switch_mutex_unlock(runtime.session_hash_mutex); + + while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + char *uuid = (char *) pop; + + if ((session = switch_core_session_locate(uuid))) { + switch_channel_hangup(session->channel, cause); + switch_core_session_rwunlock(session); + } + } + + switch_core_destroy_memory_pool(&pool); + } SWITCH_DECLARE(void) switch_core_session_hupall(switch_call_cause_t cause) @@ -129,28 +165,37 @@ switch_hash_index_t *hi; void *val; switch_core_session_t *session; - uint32_t loops = 0; + switch_memory_pool_t *pool; + switch_queue_t *queue; + void *pop; - while (session_manager.session_count > 0) { - switch_mutex_lock(runtime.session_hash_mutex); - for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); - if (val) { - session = (switch_core_session_t *) val; - if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - switch_channel_hangup(switch_core_session_get_channel(session), cause); - switch_core_session_rwunlock(session); - } + switch_core_new_memory_pool(&pool); + switch_queue_create(&queue, 250000, pool); + + switch_mutex_lock(runtime.session_hash_mutex); + for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + if (val) { + session = (switch_core_session_t *) val; + if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { + switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str)); + switch_core_session_rwunlock(session); } } - switch_mutex_unlock(runtime.session_hash_mutex); - switch_yield(1000000); - if (++loops == 30) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up with %d session%s remaining\n", - session_manager.session_count, session_manager.session_count == 1 ? "" : "s"); - break; + } + switch_mutex_unlock(runtime.session_hash_mutex); + + while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + char *uuid = (char *) pop; + + if ((session = switch_core_session_locate(uuid))) { + switch_channel_hangup(session->channel, cause); + switch_core_session_rwunlock(session); } } + + switch_core_destroy_memory_pool(&pool); + }

1 0

[commit] r12543 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: andrew Date: Mon Mar 9 15:22:42 2009 New Revision: 12543 Log: Some more memory management tweaks Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Mon Mar 9 15:22:42 2009 @@ -165,20 +165,47 @@ static switch_status_t handle_msg_fetch_reply(listener_t *listener, ei_x_buff *buf, ei_x_buff *rbuf) { char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + void *p; if (ei_decode_string_or_binary(buf->buff, &buf->index, SWITCH_UUID_FORMATTED_LENGTH, uuid_str)) { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badarg"); } else { - ei_x_buff *nbuf = switch_core_alloc(listener->pool, sizeof(nbuf)); - nbuf->buff = switch_core_alloc(listener->pool, buf->buffsz); + ei_x_buff *nbuf = malloc(sizeof(nbuf)); + nbuf->buff = malloc(buf->buffsz); memcpy(nbuf->buff, buf->buff, buf->buffsz); nbuf->index = buf->index; nbuf->buffsz = buf->buffsz; - - switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf); - ei_x_encode_atom(rbuf, "ok"); + + if ((p = switch_core_hash_find(listener->fetch_reply_hash, uuid_str))) { + if (p == &globals.TIMEOUT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handler for %s timed out\n", uuid_str); + switch_core_hash_delete(listener->fetch_reply_hash, uuid_str); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "timeout"); + } else if (p == &globals.WAITING) { + /* update the key to point at a pid */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found waiting slot for %s\n", uuid_str); + switch_core_hash_delete(listener->fetch_reply_hash, uuid_str); + switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf); + ei_x_encode_atom(rbuf, "ok"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found filled slot for %s\n", uuid_str); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "duplicate_response"); + } + } else { + /* nothin in the hash */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Empty slot for %s\n", uuid_str); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "invalid_uuid"); + } + + /*switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf);*/ } return SWITCH_STATUS_SUCCESS; } @@ -700,7 +727,7 @@ static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) { erlang_ref ref; - erlang_pid *pid;/* = switch_core_alloc(listener->pool, sizeof(erlang_pid));*/ + erlang_pid *pid; void *p; char hash[100]; int arity; Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 9 15:22:42 2009 @@ -388,7 +388,7 @@ _ei_x_encode_string(&buf, uuid_str); ei_encode_switch_event_headers(&buf, params); - /*switch_core_hash_insert(ptr->reply_hash, uuid_str, );*/ + switch_core_hash_insert(ptr->listener->fetch_reply_hash, uuid_str, &globals.WAITING); switch_mutex_lock(ptr->listener->sock_mutex); ei_sendto(ptr->listener->ec, ptr->listener->sockfd, &ptr->process, &buf); @@ -396,16 +396,19 @@ int i = 0; ei_x_buff *rep; - /*int index = 3;*/ - while (!(rep = (ei_x_buff *) switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str))) { + void *p = NULL; + + while (!(p = switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response\n"); + switch_core_hash_insert(ptr->listener->fetch_reply_hash, uuid_str, &globals.TIMEOUT); /* TODO lock this? */ return NULL; } i++; switch_yield(10000); /* 10ms */ } + rep = (ei_x_buff *) p; int type, size; ei_get_type(rep->buff, &rep->index, &type, &size); @@ -432,10 +435,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XML parsed OK!\n"); } + /* cleanup */ switch_core_hash_delete(ptr->listener->fetch_reply_hash, uuid_str); - - /*switch_safe_free(rep->buff);*/ - /*switch_safe_free(rep);*/ + free(rep->buff); + free(rep); free(xmlstr); return xml;

1 0

[commit] r12542 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 14:48:17 2009 New Revision: 12542 Log: dont fire presence event for the reporting state Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Mar 9 14:48:17 2009 @@ -968,7 +968,7 @@ switch_channel_clear_flag(channel, CF_TAGGED); - if (channel->state >= CS_ROUTING) { + if (channel->state >= CS_ROUTING && channel->state <= CS_HANGUP) { switch_channel_presence(channel, "unknown", (char *) state_names[state], NULL); }

1 0

[commit] r12541 - in freeswitch/trunk/libs/win32: . pocketsphinx
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: mikej Date: Mon Mar 9 14:45:30 2009 New Revision: 12541 Log: build: re-work windows build for latest pocketsphinx 5.1 (MODASRTTS-13) Modified: freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj freeswitch/trunk/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj Modified: freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj Mon Mar 9 14:45:30 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading pocketsphinx." - CommandLine="if not exist "$(ProjectDir)..\pocketsphinx-0.5.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pocketsphinx-0.5.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\pocketsphinx-0.5.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\pocketsphinx-0.5.99" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj Mon Mar 9 14:45:30 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading sphinxbase." - CommandLine="if not exist "$(ProjectDir)..\sphinxbase-0.4.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sphinxbase-0.4.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\sphinxbase-0.4.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sphinxbase-0.4.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\sphinxbase-0.4.99" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj Mon Mar 9 14:45:30 2009 @@ -485,6 +485,10 @@ > </File> <File + RelativePath="..\..\pocketsphinx-0.5.99\include\ps_mllr.h" + > + </File> + <File RelativePath="..\..\pocketsphinx-0.5.99\src\libpocketsphinx\s2_semi_mgau.h" > </File> @@ -1009,6 +1013,10 @@ > </File> <File + RelativePath="..\..\pocketsphinx-0.5.99\src\libpocketsphinx\ps_mllr.c" + > + </File> + <File RelativePath="..\..\pocketsphinx-0.5.99\src\libpocketsphinx\s2_semi_mgau.c" > <FileConfiguration

1 0

[commit] r12540 - freeswitch/trunk/libs/win32/flite
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: mikej Date: Mon Mar 9 14:42:41 2009 New Revision: 12540 Log: build: removal of file reference for flite (FSBUILD-139) Modified: freeswitch/trunk/libs/win32/flite/flite.2008.vcproj Modified: freeswitch/trunk/libs/win32/flite/flite.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/flite/flite.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/flite/flite.2008.vcproj Mon Mar 9 14:42:41 2009 @@ -888,10 +888,6 @@ > </File> <File - RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal16\voxdefs.h" - > - </File> - <File RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h" > </File>

1 0

[commit] r12539 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: brian Date: Mon Mar 9 13:47:37 2009 New Revision: 12539 Log: fix dialog to skip cs_reporting Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Mar 9 13:47:37 2009 @@ -1103,7 +1103,7 @@ dft_state = "confirmed"; } - if (!strcasecmp(state, "cs_execute") && !strstr(event_status, "hold")) { + if ((!strcasecmp(state, "cs_execute") && !strstr(event_status, "hold")) || !strcasecmp(state, "cs_reporting")) { goto end; }

1 0

[commit] r12538 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 13:43:17 2009 New Revision: 12538 Log: I guess we have to leave this for lusers Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Mar 9 13:43:17 2009 @@ -792,7 +792,7 @@ #ifndef __FreeBSD__ memset(&rlp, 0, sizeof(rlp)); rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlp.rlim_max = SWITCH_THREAD_STACKSIZE; + rlp.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; setrlimit(RLIMIT_STACK, &rlp); #endif

1 0

[commit] r12537 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 12:47:42 2009 New Revision: 12537 Log: update Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Mar 9 12:47:42 2009 @@ -627,7 +627,7 @@ rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; rlp.rlim_max = SWITCH_THREAD_STACKSIZE; setrlimit(RLIMIT_STACK, &rlp); - fprintf(stderr, "Error: stacksize %ld is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance....\n", + fprintf(stderr, "Error: stacksize %d is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance....\n", (int)(rlp.rlim_max / 1024), SWITCH_THREAD_STACKSIZE / 1024, argv[0]); apr_terminate(); ret = (int)execv(argv[0], argv);

1 0

[commit] r12536 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: mrene Date: Mon Mar 9 12:25:52 2009 New Revision: 12536 Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Mon Mar 9 12:25:52 2009 @@ -169,7 +169,7 @@ return ret; } -static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "[^:]+:[^:]+:[^:]+" }; +static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "[^:]+:[^:]+:.+" }; static switch_xml_config_item_t config_settings[] = { SWITCH_CONFIG_ITEM("odbc-dsn", SWITCH_CONFIG_STRING, 0, &globals.odbc_dsn, NULL, &limit_config_dsn,

1 0

[commit] r12535 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: brian Date: Mon Mar 9 11:36:56 2009 New Revision: 12535 Log: fix MODENDP-196 Modified: freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Mar 9 11:36:56 2009 @@ -433,6 +433,11 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleting Endpoint '%s'\n", ptr->interface_name); + if (switch_event_create(&event, SWITCH_EVENT_MODULE_UNLOAD) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "endpoint"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_fire(&event); + } switch_core_hash_delete(loadable_modules.endpoint_hash, ptr->interface_name); } }

1 0