February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12326 - in freeswitch/trunk/src/mod: event_handlers/mod_event_socket xml_int/mod_xml_rpc
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: anthm Date: Fri Feb 27 10:35:42 2009 New Revision: 12326 Log: avoiding initial paradox of doom Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Feb 27 10:35:42 2009 @@ -906,7 +906,7 @@ char *api_command = switch_event_get_header(stream->param_event, "fsapi-command"); char *api_args = switch_event_get_header(stream->param_event, "fsapi-args"); switch_event_t *event, *oevent; - + if (!(api_command)) { stream->write_function(stream, "<data><reply type=\"error\">INVALID API COMMAND!</reply></data>\n"); goto end; @@ -916,6 +916,12 @@ switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); oevent = stream->param_event; stream->param_event = event; + + if (!strcasecmp(api_command, "unload") && !strcasecmp(api_args, "mod_event_socket")) { + api_command = "bgapi"; + api_args = "unload mod_event_socket"; + } + switch_api_execute(api_command, api_args, NULL, stream); stream->param_event = oevent; stream->write_function(stream, " </api-command>\n</data>"); @@ -1341,9 +1347,14 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; char *cmd = switch_event_get_header(*event, "command"); - + char cheat[] = "api bgapi unload mod_event_socket"; + *reply = '\0'; + if (switch_stristr("unload mod_event_socket", cmd)) { + cmd = cheat; + } + if (!strncasecmp(cmd, "exit", 4)) { switch_clear_flag_locked(listener, LFLAG_RUNNING); switch_snprintf(reply, reply_len, "+OK bye"); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Fri Feb 27 10:35:42 2009 @@ -453,6 +453,7 @@ char *path_info = NULL; abyss_bool ret = TRUE; int html = 0, text = 0, xml = 0; + const char *api_str; stream.data = r; stream.write_function = http_stream_write; @@ -681,8 +682,14 @@ ConnWrite(r->conn, "\r\n", 2); } + if (switch_stristr("unload", command) && switch_stristr("mod_xml_rpc", r->requestInfo.query)) { + command = "bgapi"; + api_str = "unload mod_xml_rpc"; + } else { + api_str = r->requestInfo.query; + } - if (switch_api_execute(command, r->requestInfo.query, NULL, &stream) == SWITCH_STATUS_SUCCESS) { + if (switch_api_execute(command, api_str, NULL, &stream) == SWITCH_STATUS_SUCCESS) { ResponseStatus(r, 200); r->responseStarted = TRUE; //r->done = TRUE; @@ -711,6 +718,8 @@ char *command = NULL, *arg = NULL; switch_stream_handle_t stream = { 0 }; xmlrpc_value *val = NULL; + const char *x_command = "bgapi", x_arg= "unload mod_xml_rpc"; + /* Parse our argument array. */ xmlrpc_decompose_value(envP, paramArrayP, "(ss)", &command, &arg); @@ -720,6 +729,13 @@ return NULL; } + if (switch_stristr("unload", command) && switch_stristr("mod_xml_rpc", arg)) { + switch_safe_free(command); + command = x_command; + switch_safe_free(arg); + arg = x_arg; + } + SWITCH_STANDARD_STREAM(stream); if (switch_api_execute(command, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { /* Return our result. */ @@ -730,8 +746,14 @@ } /* xmlrpc-c requires us to free memory it malloced from xmlrpc_decompose_value */ - switch_safe_free(command); - switch_safe_free(arg); + if (command != x_command) { + switch_safe_free(command); + } + + if (arg != x_arg) { + switch_safe_free(arg); + } + return val; }

1 0

[commit] r12325 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 10:18:28 2009 New Revision: 12325 Log: doh Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Fri Feb 27 10:18:28 2009 @@ -712,7 +712,7 @@ int max, activity; esl_status_t status = ESL_SUCCESS; - if (!handle->connected || !handle || handle->sock == -1) { + if (!handle || !handle->connected || handle->sock == -1) { return ESL_FAIL; }

1 0

[commit] r12324 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 10:03:22 2009 New Revision: 12324 Log: remove dirty hack to get around a bug in sofia which has now been fixed. And fix registering to pointers isn't allowed Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Feb 27 10:03:22 2009 @@ -2500,11 +2500,6 @@ } } - /* dirty hack to avoid race condition in the library */ - if (status == 200 || status == 183) { - switch_yield(100);// printf("Avoiding Segfault!!!\n"); - } - if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { if (!sofia_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Feb 27 10:03:22 2009 @@ -1552,6 +1552,13 @@ ret = AUTH_FORBIDDEN; goto end; + } else { + const char *type = switch_xml_attr(user, "type"); + if (type && !strcasecmp(type, "pointer")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant register a pointer.\n"); + ret = AUTH_FORBIDDEN; + goto end; + } } if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) {

1 0

[commit] r12323 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 09:38:33 2009 New Revision: 12323 Log: Avoiding segfault Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Fri Feb 27 09:38:33 2009 @@ -381,8 +381,8 @@ static void sock_setup(esl_handle_t *handle) { #ifdef WIN32 - BOOL bOptVal = TRUE; - int bOptLen = sizeof(BOOL); + BOOL bOptVal = TRUE; + int bOptLen = sizeof(BOOL); setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&bOptVal, bOptLen); #else int x = 1; @@ -712,7 +712,7 @@ int max, activity; esl_status_t status = ESL_SUCCESS; - if (!handle->connected) { + if (!handle->connected || !handle || handle->sock == -1) { return ESL_FAIL; }

1 0

[commit] r12322 - freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: gmaruzz Date: Fri Feb 27 07:54:07 2009 New Revision: 12322 Log: skypiax: works on * too :-) Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c Fri Feb 27 07:54:07 2009 @@ -313,12 +313,21 @@ return NULL; } +char interface[256]; +int i; +memset(interface, '\0', sizeof(interface)); + +for (i=0; i<sizeof(interface); i++){ + if(name[i] == '/') + break; + interface[i]=name[i]; +} /* lock the interfaces' list */ LOKKA(&skypiax_iflock); /* make a pointer to the first interface in the interfaces list */ p = skypiax_iflist; - if (strncmp("ANY", name, 3) == 0) { + if (strcmp("ANY", interface) == 0) { /* we've been asked for the "ANY" interface, let's find the first idle interface */ DEBUGA_SKYPE("Finding one available skype interface\n", SKYPIAX_P_LOG); p = find_available_skypiax_interface(); @@ -338,9 +347,9 @@ /* Search for the requested interface and verify if is unowned and format compatible */ while (p && !found) { - size_t length = strlen(p->name); + //size_t length = strlen(p->name); /* is this the requested interface? */ - if (strncmp(name, p->name, length) == 0) { + if (strcmp(interface, p->name) == 0) { /* is the requested format supported by this interface? */ if ((format & AST_FORMAT_SLINEAR) != 0) { /* is this interface unowned? */

1 0

[commit] r12321 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: gmaruzz Date: Fri Feb 27 05:38:52 2009 New Revision: 12321 Log: skypiax: fixed stupid mistake, works on linux too :-) Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Feb 27 05:38:52 2009 @@ -1131,6 +1131,7 @@ xerror = err->error_code; ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror); + running=0; return 0; /* ignore the error */ } @@ -1237,14 +1238,15 @@ if (status != Success || format_ret != 32 || nitems_ret != 1) { SkypiaxHandles->skype_win = (Window) - 1; DEBUGA_SKYPE("Skype instance not found\n", SKYPIAX_P_LOG); - tech_pvt->SkypiaxHandles.api_connected = 0; + running =0; + SkypiaxHandles->api_connected = 0; return 0; } SkypiaxHandles->skype_win = *(const unsigned long *) prop & 0xffffffff; DEBUGA_SKYPE("Skype instance found with id #%d\n", SKYPIAX_P_LOG, (unsigned int) SkypiaxHandles->skype_win); - tech_pvt->SkypiaxHandles.api_connected = 1; + SkypiaxHandles->api_connected = 1; return 1; }

1 0

[commit] r12320 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: gmaruzz Date: Fri Feb 27 05:08:23 2009 New Revision: 12320 Log: skypiax: fixed http://jira.freeswitch.org/browse/MODSKYPIAX-21 on windows, let's check if it works on linux Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Fri Feb 27 05:08:23 2009 @@ -940,15 +940,32 @@ skypiax_audio_init(&globals.SKYPIAX_INTERFACES[interface_id]); + NOTICA("WAITING max 6 seconds to connect to SKYPE API for interface_id=%d\n", SKYPIAX_P_LOG, interface_id); i = 0; - while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 60000) { // 60sec FIXME + while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 400) { // 6sec on windows (why ????) FIXME + //DEBUGA_SKYPE("interface_id=%d, times=%d\n", SKYPIAX_P_LOG, interface_id, i); switch_sleep(1000); i++; } if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected) { - NOTICA("STARTED interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + NOTICA("SKYPE API connected for interface_id=%d, waiting max 60 seconds for CURRENTUSERHANDLE==%s\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user); } else { - ERRORA("FAILED to start interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + ERRORA("SKYPE API FAILED to connect for interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + running = 0; + return SWITCH_STATUS_FALSE; + } + + i = 0; + while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle == 0 && running && i < 4000) { // 60sec on windows (why ????) FIXME + //DEBUGA_SKYPE("interface_id=%d, times=%d\n", SKYPIAX_P_LOG, interface_id, i); + switch_sleep(1000); + i++; + } + if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle) { + NOTICA("CURRENTUSERHANDLE ok (%s), interface_id=%d STARTED\n", SKYPIAX_P_LOG, globals.SKYPIAX_INTERFACES[interface_id].skype_user, interface_id); + } else { + ERRORA("FAILED to find CURRENTUSERHANDLE=%s, FAILED to start interface_id=%d\n", SKYPIAX_P_LOG, globals.SKYPIAX_INTERFACES[interface_id].skype_user, interface_id); + running = 0; return SWITCH_STATUS_FALSE; } @@ -995,8 +1012,10 @@ running = 1; - if (load_config() != SWITCH_STATUS_SUCCESS) + if (load_config() != SWITCH_STATUS_SUCCESS) { + running = 0; return SWITCH_STATUS_FALSE; + } *module_interface = switch_loadable_module_create_module_interface(pool, modname); skypiax_endpoint_interface = @@ -1039,6 +1058,7 @@ DEBUGA_SKYPE ("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPIAX_P_LOG, GetLastError()); + globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread=NULL; } #else XEvent e; @@ -1057,9 +1077,9 @@ XSync(tech_pvt->SkypiaxHandles.disp, False); #endif } - while (x) { + while (x) {//FIXME 2 seconds? x--; - switch_yield(20000); + switch_yield(20000); } if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) { switch_thread_join(&status, Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h Fri Feb 27 05:08:23 2009 @@ -136,6 +136,7 @@ Window skype_win; Display *disp; Window win; + int currentuserhandle; int api_connected; int fdesc[2]; }; @@ -148,6 +149,7 @@ char win32_acInit_WindowClassName[128]; UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; + int currentuserhandle; int api_connected; switch_file_t *fdesc[2]; }; Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Feb 27 05:08:23 2009 @@ -100,7 +100,7 @@ where = strsep(stringp, " "); strncpy(id, where, sizeof(id) - 1); if (!strcasecmp(id, tech_pvt->skype_user)) { - tech_pvt->SkypiaxHandles.api_connected = 1; + tech_pvt->SkypiaxHandles.currentuserhandle = 1; DEBUGA_SKYPE ("Skype MSG: message: %s, currentuserhandle: %s, cuh: %s, skype_user: %s!\n", SKYPIAX_P_LOG, message, obj, id, tech_pvt->skype_user); @@ -909,6 +909,8 @@ lReturnCode = 0; fIssueDefProc = 0; tech_pvt = (private_t *) GetWindowLong(hWindow, GWL_USERDATA); + if(!running) + return lReturnCode; switch (uiMessage) { case WM_CREATE: tech_pvt = (private_t *) ((LPCREATESTRUCT) ulParam)->lpCreateParams; @@ -945,8 +947,9 @@ tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { switch (ulParam) { case SKYPECONTROLAPI_ATTACH_SUCCESS: - if (!tech_pvt->SkypiaxHandles.api_connected) { + if (!tech_pvt->SkypiaxHandles.currentuserhandle) { DEBUGA_SKYPE("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); + tech_pvt->SkypiaxHandles.api_connected = 1; tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle; @@ -957,7 +960,7 @@ ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", SKYPIAX_P_LOG); skypiax_sleep(5000); - if (!tech_pvt->SkypiaxHandles.api_connected) { + if (!tech_pvt->SkypiaxHandles.currentuserhandle) { SendMessage(HWND_BROADCAST, tech_pvt->SkypiaxHandles. win32_uiGlobal_MsgID_SkypeControlAPIDiscover, @@ -974,7 +977,7 @@ case SKYPECONTROLAPI_ATTACH_API_AVAILABLE: DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG); skypiax_sleep(5000); - if (!tech_pvt->SkypiaxHandles.api_connected) { + if (!tech_pvt->SkypiaxHandles.currentuserhandle) { SendMessage(HWND_BROADCAST, tech_pvt->SkypiaxHandles. win32_uiGlobal_MsgID_SkypeControlAPIDiscover, @@ -1234,12 +1237,14 @@ if (status != Success || format_ret != 32 || nitems_ret != 1) { SkypiaxHandles->skype_win = (Window) - 1; DEBUGA_SKYPE("Skype instance not found\n", SKYPIAX_P_LOG); + tech_pvt->SkypiaxHandles.api_connected = 0; return 0; } SkypiaxHandles->skype_win = *(const unsigned long *) prop & 0xffffffff; DEBUGA_SKYPE("Skype instance found with id #%d\n", SKYPIAX_P_LOG, (unsigned int) SkypiaxHandles->skype_win); + tech_pvt->SkypiaxHandles.api_connected = 1; return 1; }

1 0

[commit] r12319 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: robertj Date: Fri Feb 27 01:34:58 2009 New Revision: 12319 Log: Moved defines to after the include of switch.h so when precompiled headers are used they actually work. Modified: freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Fri Feb 27 01:34:58 2009 @@ -31,16 +31,16 @@ * switch_core_memory.c -- Main Core Library (memory management) * */ + +#include <switch.h> +#include "private/switch_core_pvt.h" + //#define DEBUG_ALLOC //#define DEBUG_ALLOC2 //#define DESTROY_POOLS -#define PER_POOL_LOCK //#define INSTANTLY_DESTROY_POOLS - -#include <switch.h> -#include "private/switch_core_pvt.h" /*#define LOCK_MORE*/ -/*#define PER_POOL_LOCK 1*/ +#define PER_POOL_LOCK 1 static struct { switch_mutex_t *mem_lock;

1 0

[commit] r12318 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 17:00:36 2009 New Revision: 12318 Log: revert a bad bit in r12317 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Feb 26 17:00:36 2009 @@ -1846,7 +1846,7 @@ int to = 60; if (ann) { - member->conference->special_announce = switch_core_strdup(member->pool, ann); + member->conference->special_announce = switch_core_strdup(member->conference->pool, ann); } switch_channel_set_private(channel, "_conference_autocall_list_", NULL);

1 0

[commit] r12317 - in freeswitch/trunk/src: . mod/applications/mod_conference
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: anthm Date: Thu Feb 26 16:30:00 2009 New Revision: 12317 Log: reduce memory usage Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Feb 26 16:30:00 2009 @@ -1846,7 +1846,7 @@ int to = 60; if (ann) { - member->conference->special_announce = switch_core_strdup(member->conference->pool, ann); + member->conference->special_announce = switch_core_strdup(member->pool, ann); } switch_channel_set_private(channel, "_conference_autocall_list_", NULL); @@ -2676,7 +2676,7 @@ if (!conference->sh) { memset(&conference->lsh, 0, sizeof(conference->lsh)); if (switch_core_speech_open(&conference->lsh, conference->tts_engine, conference->tts_voice, - conference->rate, conference->interval, &flags, conference->pool) != SWITCH_STATUS_SUCCESS) { + conference->rate, conference->interval, &flags, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Thu Feb 26 16:30:00 2009 @@ -34,7 +34,7 @@ //#define DEBUG_ALLOC //#define DEBUG_ALLOC2 //#define DESTROY_POOLS -//#define PER_POOL_LOCK +#define PER_POOL_LOCK //#define INSTANTLY_DESTROY_POOLS #include <switch.h> Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu Feb 26 16:30:00 2009 @@ -83,8 +83,10 @@ static switch_hash_t *CUSTOM_HASH = NULL; static int THREAD_COUNT = 0; static int SYSTEM_RUNNING = 0; +#ifdef SWITCH_EVENT_RECYCLE static switch_queue_t *EVENT_RECYCLE_QUEUE = NULL; static switch_queue_t *EVENT_HEADER_RECYCLE_QUEUE = NULL; +#endif static void launch_dispatch_threads(uint32_t max, int len, switch_memory_pool_t *pool); static char *my_dup(const char *s) @@ -422,6 +424,8 @@ SWITCH_DECLARE(void) switch_core_memory_reclaim_events(void) { +#ifdef SWITCH_EVENT_RECYCLE + void *pop; int size; size = switch_queue_size(EVENT_RECYCLE_QUEUE); @@ -437,6 +441,10 @@ while (switch_queue_trypop(EVENT_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS && pop) { free(pop); } +#else + return; +#endif + } SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void) @@ -569,8 +577,10 @@ switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL); +#ifdef SWITCH_EVENT_RECYCLE switch_queue_create(&EVENT_RECYCLE_QUEUE, 250000, THRUNTIME_POOL); switch_queue_create(&EVENT_HEADER_RECYCLE_QUEUE, 250000, THRUNTIME_POOL); +#endif switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_threadattr_priority_increase(thd_attr); @@ -595,7 +605,9 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_subclass_detailed(const char *file, const char *func, int line, switch_event_t **event, switch_event_types_t event_id, const char *subclass_name) { +#ifdef SWITCH_EVENT_RECYCLE void *pop; +#endif *event = NULL; @@ -603,12 +615,16 @@ return SWITCH_STATUS_GENERR; } +#ifdef SWITCH_EVENT_RECYCLE if (switch_queue_trypop(EVENT_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS && pop) { *event = (switch_event_t *) pop; } else { +#endif *event = ALLOC(sizeof(switch_event_t)); switch_assert(*event); +#ifdef SWITCH_EVENT_RECYCLE } +#endif memset(*event, 0, sizeof(switch_event_t)); @@ -686,9 +702,13 @@ FREE(hp->name); FREE(hp->value); memset(hp, 0, sizeof(*hp)); +#ifdef SWITCH_EVENT_RECYCLE if (switch_queue_trypush(EVENT_HEADER_RECYCLE_QUEUE, hp) != SWITCH_STATUS_SUCCESS) { FREE(hp); } +#else + FREE(hp); +#endif status = SWITCH_STATUS_SUCCESS; } else { lp = hp; @@ -702,14 +722,18 @@ { switch_event_header_t *header; switch_ssize_t hlen = -1; - void *pop; +#ifdef SWITCH_EVENT_RECYCLE + void *pop; if (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { header = (switch_event_header_t *) pop; } else { +#endif header = ALLOC(sizeof(*header)); switch_assert(header); +#ifdef SWITCH_EVENT_RECYCLE } +#endif memset(header, 0, sizeof(*header)); @@ -795,17 +819,26 @@ hp = hp->next; FREE(this->name); FREE(this->value); - memset(this, 0, sizeof(*this)); +#ifdef SWITCH_EVENT_RECYCLE if (switch_queue_trypush(EVENT_HEADER_RECYCLE_QUEUE, this) != SWITCH_STATUS_SUCCESS) { FREE(this); } +#else + FREE(this); +#endif + + } FREE(ep->body); FREE(ep->subclass_name); - memset(ep, 0, sizeof(*ep)); +#ifdef SWITCH_EVENT_RECYCLE if (switch_queue_trypush(EVENT_RECYCLE_QUEUE, ep) != SWITCH_STATUS_SUCCESS) { FREE(ep); } +#else + FREE(ep); +#endif + } *event = NULL; } Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Thu Feb 26 16:30:00 2009 @@ -58,7 +58,9 @@ static switch_log_binding_t *BINDINGS = NULL; static switch_mutex_t *BINDLOCK = NULL; static switch_queue_t *LOG_QUEUE = NULL; +#ifdef SWITCH_LOG_RECYCLE static switch_queue_t *LOG_RECYCLE_QUEUE = NULL; +#endif static int8_t THREAD_RUNNING = 0; static uint8_t MAX_LEVEL = 0; static int mods_loaded = 0; @@ -226,9 +228,14 @@ switch_mutex_unlock(BINDLOCK); switch_safe_free(node->data); +#ifdef SWITCH_LOG_RECYCLE if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) { free(node); } +#else + free(node); +#endif + } THREAD_RUNNING = 0; @@ -347,14 +354,18 @@ if (do_mods && level <= MAX_LEVEL) { switch_log_node_t *node; +#ifdef SWITCH_LOG_RECYCLE void *pop = NULL; if (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { node = (switch_log_node_t *) pop; } else { +#endif node = malloc(sizeof(*node)); switch_assert(node); +#ifdef SWITCH_LOG_RECYCLE } +#endif node->data = data; data = NULL; @@ -368,9 +379,13 @@ if (switch_queue_trypush(LOG_QUEUE, node) != SWITCH_STATUS_SUCCESS) { free(node->data); +#ifdef SWITCH_LOG_RECYCLE if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) { free(node); } +#else + free(node); +#endif node = NULL; } } @@ -395,7 +410,9 @@ switch_queue_create(&LOG_QUEUE, SWITCH_CORE_QUEUE_LEN, LOG_POOL); +#ifdef SWITCH_LOG_RECYCLE switch_queue_create(&LOG_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, LOG_POOL); +#endif switch_mutex_init(&BINDLOCK, SWITCH_MUTEX_NESTED, LOG_POOL); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, log_thread, NULL, LOG_POOL); @@ -422,6 +439,7 @@ SWITCH_DECLARE(void) switch_core_memory_reclaim_logger(void) { +#ifdef SWITCH_LOG_RECYCLE void *pop; int size = switch_queue_size(LOG_RECYCLE_QUEUE); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled log node(s) %d bytes\n", size, @@ -429,6 +447,10 @@ while (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { free(pop); } +#else + return; +#endif + } SWITCH_DECLARE(switch_status_t) switch_log_shutdown(void)

1 0