- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

11 Nov '08

Author: mikej Date: Tue Nov 11 10:30:52 2008 New Revision: 10332 Log: disable new sleep on windows 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 10:30:52 2008 @@ -408,8 +408,10 @@ 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] r10331 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: mikej Date: Tue Nov 11 10:29:35 2008 New Revision: 10331 Log: (MODENDP-148) Move "a=sendrecv" from session to media section of SDP Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Nov 11 10:29:35 2008 @@ -91,10 +91,10 @@ "o=FreeSWITCH %010u %010u IN %s %s\n" "s=FreeSWITCH\n" "c=IN %s %s\n" "t=0 0\n" - "a=%s\n" - "m=audio %d RTP/%sAVP", tech_pvt->owner_id, tech_pvt->session_id, family, ip, family, ip, sr, port, - (!switch_strlen_zero(tech_pvt->local_crypto_key) && switch_test_flag(tech_pvt, TFLAG_SECURE)) ? "S" : ""); - + "m=audio %d RTP/%sAVP", + tech_pvt->owner_id, tech_pvt->session_id, family, ip, family, ip, port, + (!switch_strlen_zero(tech_pvt->local_crypto_key) + && switch_test_flag(tech_pvt,TFLAG_SECURE)) ? "S" : ""); if (tech_pvt->rm_encoding) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); @@ -187,6 +187,9 @@ switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); } + if (sr) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=%s\n", sr); + } if (!switch_strlen_zero(tech_pvt->local_crypto_key) && switch_test_flag(tech_pvt, TFLAG_SECURE)) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=crypto:%s\n", tech_pvt->local_crypto_key);

1 0

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

11 Nov '08

Author: anthm Date: Tue Nov 11 10:25:45 2008 New Revision: 10330 Log: fix err Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Nov 11 10:25:45 2008 @@ -1159,8 +1159,9 @@ switch_channel_pre_answer(channel); if ((buuid = switch_channel_get_variable(rchannel, SWITCH_SIGNAL_BOND_VARIABLE))) { - bsession = switch_core_session_locate(buuid); - bchannel = switch_core_session_get_channel(bsession); + if ((bsession = switch_core_session_locate(buuid))) { + bchannel = switch_core_session_get_channel(bsession); + } } if (!switch_channel_test_flag(rchannel, CF_ANSWERED)) {

1 0

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

11 Nov '08

Author: anthm Date: Tue Nov 11 10:03:09 2008 New Revision: 10329 Log: let b legs use park_after_bridge too Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Nov 11 10:03:09 2008 @@ -463,6 +463,10 @@ state = switch_channel_get_state(channel); + if (state < CS_HANGUP && switch_true(switch_channel_get_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { + switch_ivr_park_session(session); + } + if (!switch_channel_test_flag(channel, CF_TRANSFER) && bd && !bd->clean_exit && state != CS_PARK && state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);

1 0

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

11 Nov '08

Author: anthm Date: Tue Nov 11 09:26:21 2008 New Revision: 10328 Log: allow calls to be stolen from originate Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Nov 11 09:26:21 2008 @@ -1638,16 +1638,21 @@ } for (i = 0; i < and_argc; i++) { + switch_channel_state_t state; + if (!peer_channels[i]) { continue; } + switch_channel_clear_flag(peer_channels[i], CF_ORIGINATING); if (status == SWITCH_STATUS_SUCCESS) { if (bleg && *bleg && *bleg == peer_sessions[i]) { continue; } - } else if (switch_channel_get_state(switch_core_session_get_channel(peer_sessions[i])) < CS_HANGUP) { - switch_channel_hangup(switch_core_session_get_channel(peer_sessions[i]), *cause); + } else if ((state=switch_channel_get_state(peer_channels[i])) < CS_HANGUP) { + if (!(state == CS_RESET || switch_channel_test_flag(peer_channels[i], CF_TRANSFER))) { + switch_channel_hangup(peer_channels[i], *cause); + } } switch_core_session_rwunlock(peer_sessions[i]);

1 0

[commit] r10327 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: anthm Date: Tue Nov 11 08:32:11 2008 New Revision: 10327 Log: update Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.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 Tue Nov 11 08:32:11 2008 @@ -414,12 +414,15 @@ if (switch_test_flag(listener, LFLAG_ASYNC)) { launch_listener_thread(listener); switch_ivr_park(session, NULL); + return; } else { listener_run(NULL, (void *) listener); } - while (switch_test_flag(listener, LFLAG_SESSION)) { - switch_yield(100000); + if (switch_channel_get_state(channel) >= CS_HANGUP) { + while (switch_test_flag(listener, LFLAG_SESSION)) { + switch_yield(100000); + } } } @@ -1602,8 +1605,13 @@ switch_mutex_lock(globals.listener_mutex); prefs.threads++; switch_mutex_unlock(globals.listener_mutex); - + switch_assert(listener != NULL); + + if ((session = listener->session)) { + channel = switch_core_session_get_channel(session); + switch_core_session_read_lock(session); + } if (prefs.acl_count && listener->sa && !switch_strlen_zero(listener->remote_ip)) { uint32_t x = 0; @@ -1624,13 +1632,7 @@ } } } - - - if ((session = listener->session)) { - channel = switch_core_session_get_channel(session); - switch_core_session_read_lock(session); - } - + if (switch_strlen_zero(listener->remote_ip)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open\n"); } else {

1 0