- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10343 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 05:42:55 2008 New Revision: 10343 Log: fix compiler warning in msvc Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Nov 12 05:42:55 2008 @@ -1257,7 +1257,7 @@ { switch_size_t bytes = 0; switch_status_t status; - uint8_t check = 0; + int check = 0; stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000;

1 0

[commit] r10341 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: brian Date: Wed Nov 12 05:28:16 2008 New Revision: 10341 Log: Don't copy the time stampes over when the sample rates differ Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Nov 12 05:28:16 2008 @@ -421,7 +421,11 @@ case SWITCH_STATUS_SUCCESS: session->enc_read_frame.samples = session->read_codec->implementation->decoded_bytes_per_packet / sizeof(int16_t); if (perfect) { - session->enc_read_frame.timestamp = read_frame->timestamp; + if (enc_frame->codec->implementation->samples_per_packet != session->read_codec->implementation->samples_per_packet) { + session->enc_read_frame.timestamp = 0; + } else { + session->enc_read_frame.timestamp = read_frame->timestamp; + } session->enc_read_frame.rate = read_frame->rate; session->enc_read_frame.ssrc = read_frame->ssrc; session->enc_read_frame.seq = read_frame->seq; @@ -793,7 +797,11 @@ case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - session->enc_write_frame.timestamp = frame->timestamp; + if (frame->codec->implementation->samples_per_packet != session->write_codec->implementation->samples_per_packet) { + session->enc_write_frame.timestamp = 0; + } else { + session->enc_write_frame.timestamp = frame->timestamp; + } session->enc_write_frame.payload = session->write_codec->implementation->ianacode; session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc;

1 0

[commit] r10340 - freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mrene Date: Tue Nov 11 22:43:34 2008 New Revision: 10340 Log: fix gcc 4.2 compiler warning Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c (original) +++ freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Tue Nov 11 22:43:34 2008 @@ -68,17 +68,17 @@ for(hi = switch_hash_first(NULL, channel_hash); hi; hi = switch_hash_next(hi)) { void *val = NULL; - const char *key; + const void *key; switch_ssize_t keylen; limit_hash_item_t *item = NULL; - switch_hash_this(hi, (const void**)&key, &keylen, &val); + switch_hash_this(hi, &key, &keylen, &val); item = (limit_hash_item_t*)val; /* We keep the structure even though the count is 0 so we do not allocate too often */ item->total_usage--; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", key, item->total_usage); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", (const char*)key, item->total_usage); } switch_core_event_hook_remove_state_change(session, state_handler); switch_mutex_unlock(globals.mutex);

1 0

[commit] r10339 - freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mrene Date: Tue Nov 11 22:36:41 2008 New Revision: 10339 Log: Make it work with multiple limit checks on the same channel (same and different realm+id) It is also possible to rate-limit and value-limit the same realm+id. For example: <action application="limit_hash" data="test test 3 no_more_channels XML default" /> <action application="limit_hash" data="test test 3/10 too_fast XML default" /> Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c (original) +++ freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Tue Nov 11 22:36:41 2008 @@ -30,7 +30,7 @@ #include <switch.h> -#define LIMIT_SYNTAX "<realm> <id> <max>[/interval] [transfer_destination_number [transfer_destination_context]]" +#define LIMIT_SYNTAX "<realm> <id> <max>[/interval] [transfer_destination_number [transfer_destination_dialplan [transfer_destination_context]]]" SWITCH_MODULE_LOAD_FUNCTION(mod_limit_hash_load); SWITCH_MODULE_DEFINITION(mod_limit_hash, mod_limit_hash_load, NULL , NULL); @@ -48,27 +48,39 @@ uint32_t rate_usage; time_t last_check; }; +typedef struct limit_hash_item limit_hash_item_t; static char *limit_def_xfer_exten = "limit_exceeded"; -typedef struct limit_hash_item limit_hash_item_t; - +/* Callback procedure so we know when to decrement counters */ static switch_status_t state_handler(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_state_t state = switch_channel_get_state(channel); - char *hashkey = switch_channel_get_private(channel, "limit_hashkey"); - limit_hash_item_t *item = NULL; + switch_hash_t *channel_hash = switch_channel_get_private(channel, "limit_hash"); + /* The call is either hung up, or is going back into the dialplan, decrement appropriate couters */ if (state == CS_HANGUP || state == CS_ROUTING) { + switch_hash_index_t *hi; switch_mutex_lock(globals.mutex); - item = (limit_hash_item_t*)switch_core_hash_find(globals.hash, hashkey); - - /* We keep the structure even though the count is 0 so we do not allocate too often */ - item->total_usage--; - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Usage for %s is now %d\n", hashkey, item->total_usage); - + + /* Loop through the channel's hashtable which contains mapping to all the limit_hash_item_t referenced by that channel */ + for(hi = switch_hash_first(NULL, channel_hash); hi; hi = switch_hash_next(hi)) + { + void *val = NULL; + const char *key; + switch_ssize_t keylen; + limit_hash_item_t *item = NULL; + + switch_hash_this(hi, (const void**)&key, &keylen, &val); + + item = (limit_hash_item_t*)val; + + /* We keep the structure even though the count is 0 so we do not allocate too often */ + item->total_usage--; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", key, item->total_usage); + } + switch_core_event_hook_remove_state_change(session, state_handler); switch_mutex_unlock(globals.mutex); } @@ -90,7 +102,11 @@ limit_hash_item_t *item = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); time_t now = switch_timestamp(NULL); + switch_hash_t *channel_hash = NULL; + uint8_t increment = 1; + uint8_t new_channel = 0; + /* Parse application data */ if (!switch_strlen_zero(data)) { mydata = switch_core_session_strdup(session, data); argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -101,8 +117,6 @@ return; } - switch_mutex_lock(globals.mutex); - realm = argv[0]; id = argv[1]; if ((szinterval = strchr(argv[2], '/'))) @@ -123,45 +137,72 @@ max = 0; } - hashkey = switch_core_session_sprintf(session, "limit_%s_%s", realm, id); + hashkey = switch_core_session_sprintf(session, "%s_%s", realm, id); + switch_mutex_lock(globals.mutex); + /* Check if that realm+id has ever been checked */ if (!(item = (limit_hash_item_t*)switch_core_hash_find(globals.hash, hashkey))) { + /* No, create an empty structure and add it, then continue like as if it existed */ item = (limit_hash_item_t*)switch_core_alloc(globals.pool, sizeof(limit_hash_item_t)); memset(item, 0, sizeof(limit_hash_item_t)); switch_core_hash_insert(globals.hash, hashkey, item); } - if (item->last_check <= (now - interval)) { - item->rate_usage = 1; - item->last_check = now; - } else { - if (interval > 0 && item->rate_usage + 1 > max) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s exceeds maximum rate of %d/%ds\n", - hashkey, max, interval); - switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); - goto end; + /* Did we already run on this channel before? */ + if ((channel_hash = switch_channel_get_private(channel, "limit_hash"))) + { + // Yes, but check if we did that realm+id + if (!switch_core_hash_find(channel_hash, hashkey)) { + // No, add it to our table so the state handler can take care of it + switch_core_hash_insert(channel_hash, hashkey, item); + } else { + /* Yes, dont touch total counter */ + increment = 0; } - item->rate_usage++; + } else { + /* This is the first limit check on this channel, create a hashtable, set our prviate data and add a state handler */ + new_channel = 1; } - if (interval == 0 && item->total_usage + 1 > max) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s is already at max value\n", hashkey); + if (interval > 0) { + if (item->last_check <= (now - interval)) { + item->rate_usage = 1; + item->last_check = now; + } else { + // Always increment rate when its checked as it doesnt depend on the channel + item->rate_usage++; + + if (item->rate_usage > max) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s exceeds maximum rate of %d/%ds, now at %d\n", hashkey, max, interval, item->rate_usage); + switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); + goto end; + } + } + } else if (/* interval == 0 && */ item->total_usage + increment > max) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s is already at max value (%d)\n", hashkey, item->total_usage); switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); goto end; } - - item->total_usage++; - - if (interval == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Usage for %s is now %d/%d\n", hashkey, item->total_usage, max); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval); + + if (increment) { + item->total_usage++; + + if (interval == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d\n", hashkey, item->total_usage, max); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval); + } } + - switch_channel_set_private(channel, "limit_hashkey", hashkey); - switch_core_event_hook_add_state_change(session, state_handler); + if (new_channel) { + switch_core_hash_init(&channel_hash, switch_core_session_get_pool(session)); + switch_core_hash_insert(channel_hash, hashkey, item); + switch_channel_set_private(channel, "limit_hash", channel_hash); + switch_core_event_hook_add_state_change(session, state_handler); + } -end: +end: switch_mutex_unlock(globals.mutex); } @@ -180,8 +221,7 @@ switch_core_hash_init(&globals.hash, pool); - SWITCH_ADD_APP(app_interface, "limit_hash", "Limit", - "Limits various resources usage", limit_hash_function, LIMIT_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "limit_hash", "Limit (hashtable backend)", "Limits various resources usage", limit_hash_function, LIMIT_SYNTAX, SAF_SUPPORT_NOMEDIA); return SWITCH_STATUS_NOUNLOAD; /* Potential Kaboom(tm) if we have active calls */ }

1 0

[commit] r10338 - freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mrene Date: Tue Nov 11 19:33:07 2008 New Revision: 10338 Log: update syntax Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c (original) +++ freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Tue Nov 11 19:33:07 2008 @@ -30,7 +30,7 @@ #include <switch.h> -#define LIMIT_SYNTAX "<realm> <id> <max> [transfer_destination_number]" +#define LIMIT_SYNTAX "<realm> <id> <max>[/interval] [transfer_destination_number [transfer_destination_context]]" SWITCH_MODULE_LOAD_FUNCTION(mod_limit_hash_load); SWITCH_MODULE_DEFINITION(mod_limit_hash, mod_limit_hash_load, NULL , NULL);

1 0

[commit] r10337 - freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mrene Date: Tue Nov 11 19:28:48 2008 New Revision: 10337 Log: Hashtable-based resource limitations module. Resembles mod_limit a lot, except you can do rate-limiting. <action application="limit_hash" data="test test 3/10 default uhoh" /> This will limit to 3 calls per 10 seconds. Omitting /interval will behave exactly like mod_limit. Added: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/ freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Added: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Tue Nov 11 19:28:48 2008 @@ -0,0 +1,198 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Mathieu Rene <mathieu.rene(a)gmail.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Anyone writing code for the original mod_limit + * + * mod_limit_hash.c -- Resource Limit Module + * + */ + +#include <switch.h> + +#define LIMIT_SYNTAX "<realm> <id> <max> [transfer_destination_number]" + +SWITCH_MODULE_LOAD_FUNCTION(mod_limit_hash_load); +SWITCH_MODULE_DEFINITION(mod_limit_hash, mod_limit_hash_load, NULL , NULL); + + +static struct { + switch_memory_pool_t *pool; + switch_mutex_t *mutex; + switch_hash_t *hash; +} globals; + + +struct limit_hash_item { + uint32_t total_usage; + uint32_t rate_usage; + time_t last_check; +}; + +static char *limit_def_xfer_exten = "limit_exceeded"; + +typedef struct limit_hash_item limit_hash_item_t; + +static switch_status_t state_handler(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_state_t state = switch_channel_get_state(channel); + char *hashkey = switch_channel_get_private(channel, "limit_hashkey"); + limit_hash_item_t *item = NULL; + + if (state == CS_HANGUP || state == CS_ROUTING) { + switch_mutex_lock(globals.mutex); + item = (limit_hash_item_t*)switch_core_hash_find(globals.hash, hashkey); + + /* We keep the structure even though the count is 0 so we do not allocate too often */ + item->total_usage--; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Usage for %s is now %d\n", hashkey, item->total_usage); + + switch_mutex_unlock(globals.mutex); + } + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_STANDARD_APP(limit_hash_function) +{ + int argc = 0; + char *argv[6] = { 0 }; + char *mydata = NULL; + char *realm = NULL; + char *id = NULL; + char *hashkey = NULL; + char *xfer_exten = NULL; + int max = 0; + int interval = 0; + char *szinterval = NULL; + limit_hash_item_t *item = NULL; + switch_channel_t *channel = switch_core_session_get_channel(session); + time_t now = switch_timestamp(NULL); + + if (!switch_strlen_zero(data)) { + mydata = switch_core_session_strdup(session, data); + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: limit_hash %s\n", LIMIT_SYNTAX); + return; + } + + switch_mutex_lock(globals.mutex); + + realm = argv[0]; + id = argv[1]; + if ((szinterval = strchr(argv[2], '/'))) + { + *szinterval++ = '\0'; + interval = atoi(szinterval); + } + + max = atoi(argv[2]); + + if (argc >= 4) { + xfer_exten = argv[3]; + } else { + xfer_exten = limit_def_xfer_exten; + } + + if (max < 0) { + max = 0; + } + + hashkey = switch_core_session_sprintf(session, "limit_%s_%s", realm, id); + + if (!(item = (limit_hash_item_t*)switch_core_hash_find(globals.hash, hashkey))) { + item = (limit_hash_item_t*)switch_core_alloc(globals.pool, sizeof(limit_hash_item_t)); + memset(item, 0, sizeof(limit_hash_item_t)); + switch_core_hash_insert(globals.hash, hashkey, item); + } + + if (item->last_check <= (now - interval)) { + item->rate_usage = 1; + item->last_check = now; + } else { + if (interval > 0 && item->rate_usage + 1 > max) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s exceeds maximum rate of %d/%ds\n", + hashkey, max, interval); + switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); + goto end; + } + item->rate_usage++; + } + + if (interval == 0 && item->total_usage + 1 > max) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s is already at max value\n", hashkey); + switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); + goto end; + } + + item->total_usage++; + + if (interval == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Usage for %s is now %d/%d\n", hashkey, item->total_usage, max); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval); + } + + switch_channel_set_private(channel, "limit_hashkey", hashkey); + switch_core_event_hook_add_state_change(session, state_handler); + +end: + switch_mutex_unlock(globals.mutex); +} + + +SWITCH_MODULE_LOAD_FUNCTION(mod_limit_hash_load) +{ + switch_application_interface_t *app_interface; + + memset(&globals, 0, sizeof(&globals)); + + globals.pool = pool; + + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + switch_core_hash_init(&globals.hash, pool); + + SWITCH_ADD_APP(app_interface, "limit_hash", "Limit", + "Limits various resources usage", limit_hash_function, LIMIT_SYNTAX, SAF_SUPPORT_NOMEDIA); + + return SWITCH_STATUS_NOUNLOAD; /* Potential Kaboom(tm) if we have active calls */ +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: + */

1 0

[commit] r10336 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: anthm Date: Tue Nov 11 14:45:28 2008 New Revision: 10336 Log: update Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Nov 11 14:45:28 2008 @@ -202,11 +202,12 @@ do_yield(ms * 1000); } + switch_mutex_lock(TIMER_MATRIX[1].mutex); while(globals.RUNNING == 1 && globals.use_cond_yield == 1 && ms--) { - switch_mutex_lock(TIMER_MATRIX[1].mutex); switch_thread_cond_wait(TIMER_MATRIX[1].cond, TIMER_MATRIX[1].mutex); - switch_mutex_unlock(TIMER_MATRIX[1].mutex); } + switch_mutex_unlock(TIMER_MATRIX[1].mutex); + } static switch_status_t timer_init(switch_timer_t *timer) @@ -302,12 +303,12 @@ timer_step(timer); #if 1 + switch_mutex_lock(TIMER_MATRIX[timer->interval].mutex); while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { check_roll(); - switch_mutex_lock(TIMER_MATRIX[timer->interval].mutex); - switch_thread_cond_wait(TIMER_MATRIX[timer->interval].cond, TIMER_MATRIX[timer->interval].mutex); - switch_mutex_unlock(TIMER_MATRIX[timer->interval].mutex); + switch_thread_cond_wait(TIMER_MATRIX[timer->interval].cond, TIMER_MATRIX[timer->interval].mutex); } + switch_mutex_unlock(TIMER_MATRIX[timer->interval].mutex); #else while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { check_roll();

1 0

[commit] r10335 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: anthm Date: Tue Nov 11 14:27:49 2008 New Revision: 10335 Log: sigterm works again Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Nov 11 14:27:49 2008 @@ -123,7 +123,7 @@ } #else /* for unix, send the signal to kill. */ - kill(pid, SIGILL); + kill(pid, SIGTERM); #endif } @@ -566,6 +566,7 @@ } signal(SIGILL, handle_SIGILL); + signal(SIGTERM, handle_SIGILL); if (nc) { #ifdef WIN32

1 0

[commit] r10334 - in freeswitch/trunk: libs/apr/include/arch/win32 libs/apr/locks/win32 src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: mikej Date: Tue Nov 11 13:35:48 2008 New Revision: 10334 Log: pull back change from apr 1.3.0 " *) Rework the WIN32 CV code to signal the condition only if one or more threads are blocked on the condition variable. If no threads are waiting on the condition variable, nothing happens. The change also eliminates the thundering-herd problem of the manual-reset event, which (theoretically) wakes up all threads waiting on. Now the behavior of the CV's should be the same on Unix and win32 platforms. PR 42305. [Davi Arnaut] " Modified: freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_thread_cond.h freeswitch/trunk/libs/apr/locks/win32/thread_cond.c freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_thread_cond.h ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_thread_cond.h (original) +++ freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_thread_cond.h Tue Nov 11 13:35:48 2008 @@ -21,10 +21,11 @@ struct apr_thread_cond_t { apr_pool_t *pool; - HANDLE event; - int signal_all; - int num_waiting; - int signalled; + HANDLE semaphore; + CRITICAL_SECTION csection; + unsigned long num_waiting; + unsigned long num_wake; + unsigned long generation; }; #endif /* THREAD_COND_H */ Modified: freeswitch/trunk/libs/apr/locks/win32/thread_cond.c ============================================================================== --- freeswitch/trunk/libs/apr/locks/win32/thread_cond.c (original) +++ freeswitch/trunk/libs/apr/locks/win32/thread_cond.c Tue Nov 11 13:35:48 2008 @@ -18,67 +18,98 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_strings.h" -#include "win32/apr_arch_thread_mutex.h" -#include "win32/apr_arch_thread_cond.h" +#include "apr_arch_thread_mutex.h" +#include "apr_arch_thread_cond.h" #include "apr_portable.h" +#include <limits.h> + static apr_status_t thread_cond_cleanup(void *data) { apr_thread_cond_t *cond = data; - CloseHandle(cond->event); + CloseHandle(cond->semaphore); + DeleteCriticalSection(&cond->csection); return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond, apr_pool_t *pool) { - *cond = apr_palloc(pool, sizeof(**cond)); - (*cond)->pool = pool; - (*cond)->event = CreateEvent(NULL, TRUE, FALSE, NULL); - (*cond)->signal_all = 0; - (*cond)->num_waiting = 0; + apr_thread_cond_t *cv; + + cv = apr_pcalloc(pool, sizeof(**cond)); + if (cv == NULL) { + return APR_ENOMEM; + } + + cv->semaphore = CreateSemaphore(NULL, 0, LONG_MAX, NULL); + if (cv->semaphore == NULL) { + return apr_get_os_error(); + } - apr_pool_cleanup_register(pool, *cond, thread_cond_cleanup, - apr_pool_cleanup_null); + *cond = cv; + cv->pool = pool; + InitializeCriticalSection(&cv->csection); + apr_pool_cleanup_register(cv->pool, cv, thread_cond_cleanup, + apr_pool_cleanup_null); return APR_SUCCESS; } +APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond) +{ + return apr_pool_cleanup_run(cond->pool, cond, thread_cond_cleanup); +} + static APR_INLINE apr_status_t _thread_cond_timedwait(apr_thread_cond_t *cond, apr_thread_mutex_t *mutex, DWORD timeout_ms ) { DWORD res; - - while (1) { - cond->num_waiting++; - - apr_thread_mutex_unlock(mutex); - res = WaitForSingleObject(cond->event, timeout_ms); - apr_thread_mutex_lock(mutex); - cond->num_waiting--; - if (res != WAIT_OBJECT_0) { - apr_status_t rv = apr_get_os_error(); - if (res == WAIT_TIMEOUT) { - return APR_TIMEUP; + apr_status_t rv; + unsigned int wake = 0; + unsigned long generation; + + EnterCriticalSection(&cond->csection); + cond->num_waiting++; + generation = cond->generation; + LeaveCriticalSection(&cond->csection); + + apr_thread_mutex_unlock(mutex); + + do { + res = WaitForSingleObject(cond->semaphore, timeout_ms); + + EnterCriticalSection(&cond->csection); + + if (cond->num_wake) { + if (cond->generation != generation) { + cond->num_wake--; + cond->num_waiting--; + rv = APR_SUCCESS; + break; + } else { + wake = 1; } - return apr_get_os_error(); } - if (cond->signal_all) { - if (cond->num_waiting == 0) { - cond->signal_all = 0; - cond->signalled = 0; - ResetEvent(cond->event); - } + else if (res != WAIT_OBJECT_0) { + cond->num_waiting--; + rv = APR_TIMEUP; break; } - else if (cond->signalled) { - cond->signalled = 0; - ResetEvent(cond->event); - break; + + LeaveCriticalSection(&cond->csection); + + if (wake) { + wake = 0; + ReleaseSemaphore(cond->semaphore, 1, NULL); } - } - return APR_SUCCESS; + } while (1); + + LeaveCriticalSection(&cond->csection); + apr_thread_mutex_lock(mutex); + + return rv; } APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond, @@ -98,35 +129,40 @@ APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond) { - apr_status_t rv = APR_SUCCESS; - DWORD res; + unsigned int wake = 0; - cond->signalled = 1; - res = SetEvent(cond->event); - if (res == 0) { - rv = apr_get_os_error(); + EnterCriticalSection(&cond->csection); + if (cond->num_waiting > cond->num_wake) { + wake = 1; + cond->num_wake++; + cond->generation++; } - return rv; + LeaveCriticalSection(&cond->csection); + + if (wake) { + ReleaseSemaphore(cond->semaphore, 1, NULL); + } + + return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond) { - apr_status_t rv = APR_SUCCESS; - DWORD res; + unsigned long num_wake = 0; - cond->signalled = 1; - cond->signal_all = 1; - res = SetEvent(cond->event); - if (res == 0) { - rv = apr_get_os_error(); + EnterCriticalSection(&cond->csection); + if (cond->num_waiting > cond->num_wake) { + num_wake = cond->num_waiting - cond->num_wake; + cond->num_wake = cond->num_waiting; + cond->generation++; } - return rv; -} + LeaveCriticalSection(&cond->csection); -APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond) -{ - return apr_pool_cleanup_run(cond->pool, cond, thread_cond_cleanup); + if (num_wake) { + ReleaseSemaphore(cond->semaphore, num_wake, NULL); + } + + return APR_SUCCESS; } APR_POOL_IMPLEMENT_ACCESSOR(thread_cond) - Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Nov 11 13:35:48 2008 @@ -408,9 +408,7 @@ switch_mutex_init(&TIMER_MATRIX[1].mutex, SWITCH_MUTEX_NESTED, module_pool); switch_thread_cond_create(&TIMER_MATRIX[1].cond, module_pool); -#ifndef WIN32 globals.use_cond_yield = globals.RUNNING == 1; -#endif while (globals.RUNNING == 1) { runtime.reference += STEP_MIC;

1 0

[commit] r10333 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: brian Date: Tue Nov 11 12:49:08 2008 New Revision: 10333 Log: no it doesn't Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue Nov 11 12:49:08 2008 @@ -61,7 +61,7 @@   <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${target_domain}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> -  +  <param name="manage-presence" value="true"/>

1 0