[Freeswitch-svn] [commit] r2693 - in freeswitch/trunk: conf src src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia src/mod/timers/mod_threadtimer
Freeswitch SVN
anthm at freeswitch.org
Wed Sep 13 20:15:04 EDT 2006
Author: anthm
Date: Wed Sep 13 20:15:03 2006
New Revision: 2693
Added:
freeswitch/trunk/src/mod/timers/mod_threadtimer/
freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.c
freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.vcproj
Modified:
freeswitch/trunk/conf/freeswitch.xml
freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
freeswitch/trunk/src/switch_buffer.c
freeswitch/trunk/src/switch_core.c
freeswitch/trunk/src/switch_ivr.c
freeswitch/trunk/src/switch_rtp.c
Log:
performance tweaks
Modified: freeswitch/trunk/conf/freeswitch.xml
==============================================================================
--- freeswitch/trunk/conf/freeswitch.xml (original)
+++ freeswitch/trunk/conf/freeswitch.xml Wed Sep 13 20:15:03 2006
@@ -112,6 +112,7 @@
<param name="codec-prefs" value="PCMU at 20i"/>
<param name="codec-ms" value="20"/>
<param name="use-rtp-timer" value="true"/>
+ <param name="rtp-timer-name" value="thread_soft"/>
<param name="rtp-ip" value="192.168.1.20"/>
<param name="sip-ip" value="192.168.1.20"/>
<!-- optional ; -->
Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Sep 13 20:15:03 2006
@@ -1242,6 +1242,10 @@
profile->exten) {
ldl_handle_t *handle;
+ if (switch_test_flag(profile, TFLAG_TIMER) && !profile->timer_name) {
+ profile->timer_name = switch_core_strdup(module_pool, "soft");
+ }
+
if (login) {
if (ldl_handle_init(&handle,
profile->login,
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Sep 13 20:15:03 2006
@@ -642,7 +642,6 @@
static void deactivate_rtp(private_object_t *tech_pvt)
{
int loops = 0;//, sock = -1;
-
if (switch_rtp_ready(tech_pvt->rtp_session)) {
while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) {
switch_yield(10000);
@@ -730,10 +729,6 @@
ms = tech_pvt->read_codec.implementation->microseconds_per_frame;
flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_MINI);
- if (switch_test_flag(tech_pvt, TFLAG_TIMER)) {
- flags = (switch_rtp_flag_t) (flags | SWITCH_RTP_FLAG_USE_TIMER);
- }
-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n",
switch_channel_get_name(channel),
@@ -1844,6 +1839,10 @@
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Duration out of bounds!\n");
}
}
+ }
+
+ if (switch_test_flag(profile, TFLAG_TIMER) && !profile->timer_name) {
+ profile->timer_name = switch_core_strdup(profile->pool, "soft");
}
if (!profile->username) {
Added: freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.c Wed Sep 13 20:15:03 2006
@@ -0,0 +1,275 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005/2006, Anthony Minessale II <anthmct at 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
+ * Anthony Minessale II <anthmct at yahoo.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Anthony Minessale II <anthmct at yahoo.com>
+ *
+ *
+ * mod_threadtimer.c -- Software Timer Module
+ *
+ */
+#include <switch.h>
+#include <stdio.h>
+
+static switch_memory_pool_t *module_pool = NULL;
+
+static struct {
+ int32_t RUNNING;
+ switch_mutex_t *mutex;
+} globals;
+
+static const char modname[] = "mod_threadtimer";
+#define MAX_ELEMENTS 1000
+
+struct timer_private {
+ uint32_t tick;
+ uint32_t reference;
+ uint32_t interval;
+ switch_mutex_t *mutex;
+ struct timer_private *next;
+};
+
+typedef struct timer_private timer_private_t;
+
+struct timer_head {
+ timer_private_t *private_info;
+ switch_mutex_t *mutex;
+};
+typedef struct timer_head timer_head_t;
+
+static timer_head_t *TIMER_MATRIX[MAX_ELEMENTS+1];
+
+static inline switch_status_t timer_init(switch_timer_t *timer)
+{
+ timer_private_t *private_info;
+ timer_head_t *head;
+
+ if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) {
+ timer->private_info = private_info;
+ if (!TIMER_MATRIX[timer->interval]) {
+ if (!(TIMER_MATRIX[timer->interval] = switch_core_alloc(module_pool, sizeof(timer_head_t)))) {
+ return SWITCH_STATUS_MEMERR;
+ }
+ switch_mutex_init(&TIMER_MATRIX[timer->interval]->mutex, SWITCH_MUTEX_NESTED, module_pool);
+ }
+
+ head = TIMER_MATRIX[timer->interval];
+
+ switch_mutex_init(&private_info->mutex, SWITCH_MUTEX_NESTED, timer->memory_pool);
+ private_info->interval = timer->interval;
+
+ switch_mutex_lock(head->mutex);
+ private_info->next = head->private_info;
+ head->private_info = private_info;
+ switch_mutex_unlock(head->mutex);
+
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+ return SWITCH_STATUS_MEMERR;
+}
+
+#define MAX_TICKS 0xFFFFFF00
+#define check_overflow(p) if (p->reference > MAX_TICKS) {\
+ switch_mutex_lock(p->mutex);\
+ p->reference = p->tick = 0;\
+ switch_mutex_unlock(p->mutex);\
+ }\
+
+
+static inline switch_status_t timer_step(switch_timer_t *timer)
+{
+ timer_private_t *private_info = timer->private_info;
+
+ switch_mutex_lock(private_info->mutex);
+ private_info->reference += private_info->interval;
+ switch_mutex_unlock(private_info->mutex);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+static inline switch_status_t timer_next(switch_timer_t *timer)
+{
+ timer_private_t *private_info = timer->private_info;
+
+
+ timer_step(timer);
+ while (private_info->tick < private_info->reference) {
+ switch_yield(1000);
+ }
+ check_overflow(private_info);
+ timer->samplecount += timer->samples;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static inline switch_status_t timer_check(switch_timer_t *timer)
+
+{
+ timer_private_t *private_info = timer->private_info;
+ switch_status_t status;
+
+ switch_mutex_lock(private_info->mutex);
+ if (private_info->tick < private_info->reference) {
+ status = SWITCH_STATUS_FALSE;
+ } else {
+ private_info->reference += private_info->interval;
+ check_overflow(private_info);
+ status = SWITCH_STATUS_SUCCESS;
+ }
+ switch_mutex_unlock(private_info->mutex);
+
+ return status;
+}
+
+
+static inline switch_status_t timer_destroy(switch_timer_t *timer)
+{
+ timer_private_t *private_info = timer->private_info;
+ timer_head_t *head;
+ timer_private_t *ptr, *last = NULL;
+
+ head = TIMER_MATRIX[timer->interval];
+ assert(head != NULL);
+ assert(private_info != NULL);
+
+ switch_mutex_lock(head->mutex);
+ for(ptr = head->private_info; ptr; ptr = ptr->next) {
+ if (ptr == private_info) {
+ if (last) {
+ last->next = private_info->next;
+ } else {
+ head->private_info = private_info->next;
+ }
+ }
+ last = ptr;
+ }
+ switch_mutex_unlock(head->mutex);
+
+ timer->private_info = NULL;
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static const switch_timer_interface_t timer_interface = {
+ /*.interface_name */ "thread_soft",
+ /*.timer_init */ timer_init,
+ /*.timer_next */ timer_next,
+ /*.timer_step */ timer_step,
+ /*.timer_check */ timer_check,
+ /*.timer_destroy */ timer_destroy
+};
+
+static const switch_loadable_module_interface_t mod_threadtimer_module_interface = {
+ /*.module_name */ modname,
+ /*.endpoint_interface */ NULL,
+ /*.timer_interface */ &timer_interface,
+ /*.switch_dialplan_interface */ NULL,
+ /*.switch_codec_interface */ NULL,
+ /*.switch_application_interface */ NULL
+};
+
+SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename)
+{
+
+ if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n");
+ return SWITCH_STATUS_MEMERR;
+ }
+
+ /* connect my internal structure to the blank pointer passed to me */
+ *module_interface = &mod_threadtimer_module_interface;
+
+ /* indicate that the module should continue to be loaded */
+ return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
+{
+ switch_time_t reference = switch_time_now();
+ uint32_t current_ms = 0;
+ timer_private_t *ptr;
+ uint32_t x;
+
+ memset(&globals, 0, sizeof(globals));
+ switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
+
+ globals.RUNNING = 1;
+
+ while(globals.RUNNING == 1) {
+ reference += 1000;
+
+ while (switch_time_now() < reference) {
+ switch_yield(500);
+ }
+
+ current_ms++;
+
+ for (x = 0; x < 1000; x++) {
+ int i = x, index;
+ if (i == 0) {
+ i = 1;
+ }
+
+ index = (current_ms % i == 0) ? i : 0;
+
+ if (TIMER_MATRIX[index] && TIMER_MATRIX[index]->private_info) {
+ switch_mutex_lock(TIMER_MATRIX[index]->mutex);
+ for (ptr = TIMER_MATRIX[index]->private_info; ptr; ptr = ptr->next) {
+ switch_mutex_lock(ptr->mutex);
+ ptr->tick += ptr->interval;
+ switch_mutex_unlock(ptr->mutex);
+ }
+ switch_mutex_unlock(TIMER_MATRIX[index]->mutex);
+ }
+ }
+
+ if (current_ms == MAX_ELEMENTS) {
+ current_ms = 0;
+ }
+ }
+
+ switch_mutex_lock(globals.mutex);
+ globals.RUNNING = 0;
+ switch_mutex_unlock(globals.mutex);
+
+ return SWITCH_STATUS_TERM;
+}
+
+
+SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
+{
+
+ if (globals.RUNNING) {
+ switch_mutex_lock(globals.mutex);
+ globals.RUNNING = -1;
+ switch_mutex_unlock(globals.mutex);
+
+ while (globals.RUNNING) {
+ switch_yield(10000);
+ }
+ }
+
+ return SWITCH_STATUS_SUCCESS;
+}
Added: freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.vcproj Wed Sep 13 20:15:03 2006
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="mod_threadtimer"
+ ProjectGUID="{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"
+ RootNamespace="mod_threadtimer"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ WarnAsError="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
+ SubSystem="2"
+ ImportLibrary="$(OutDir)/mod_threadtimer.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ WarnAsError="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(OutDir)/mod_threadtimer.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\mod_threadtimer.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: freeswitch/trunk/src/switch_buffer.c
==============================================================================
--- freeswitch/trunk/src/switch_buffer.c (original)
+++ freeswitch/trunk/src/switch_buffer.c Wed Sep 13 20:15:03 2006
@@ -39,7 +39,8 @@
} switch_buffer_flag_t;
struct switch_buffer {
- unsigned char *data;
+ switch_byte_t *data;
+ switch_byte_t *front;
switch_size_t used;
switch_size_t datalen;
switch_size_t max_len;
@@ -56,6 +57,7 @@
&& (new_buffer->data = switch_core_alloc(pool, max_len)) != 0) {
new_buffer->datalen = max_len;
new_buffer->id = buffer_id++;
+ new_buffer->front = new_buffer->data;
*buffer = new_buffer;
return SWITCH_STATUS_SUCCESS;
}
@@ -84,6 +86,7 @@
new_buffer->datalen = start_len;
new_buffer->id = buffer_id++;
new_buffer->blocksize = blocksize;
+ new_buffer->front = new_buffer->data;
switch_set_flag(new_buffer, SWITCH_BUFFER_FLAG_DYNAMIC);
*buffer = new_buffer;
@@ -163,8 +166,9 @@
reading = buffer->used;
}
- memcpy(data, buffer->data, reading);
- memmove(buffer->data, buffer->data + reading, buffer->datalen - reading);
+ memcpy(data, buffer->front, reading);
+
+ buffer->front += reading;
buffer->used -= reading;
//if (buffer->id == 3) printf("%u o %d = %d\n", buffer->id, (uint32_t)reading, (uint32_t)buffer->used);
return reading;
@@ -180,10 +184,15 @@
freespace = buffer->datalen - buffer->used;
+ if (buffer->front != buffer->data) {
+ memmove(buffer->data, buffer->front, buffer->used);
+ buffer->front = buffer->data;
+ }
+
if (switch_test_flag(buffer, SWITCH_BUFFER_FLAG_DYNAMIC)) {
if (freespace < datalen) {
switch_size_t new_size, new_block_size;
-
+
new_size = buffer->datalen + datalen;
new_block_size = buffer->datalen + buffer->blocksize;
@@ -194,7 +203,6 @@
if (!(buffer->data = realloc(buffer->data, new_size))) {
return 0;
}
-
buffer->datalen = new_size;
}
}
Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c (original)
+++ freeswitch/trunk/src/switch_core.c Wed Sep 13 20:15:03 2006
@@ -39,6 +39,7 @@
#endif
//#define DEBUG_ALLOC
+#define DO_EVENTS
#ifdef CRASH_PROT
#define __CP "ENABLED"
@@ -3268,7 +3269,7 @@
}
-
+#ifdef DO_EVENTS
static void core_event_handler(switch_event_t *event)
{
char *sql = NULL;
@@ -3371,6 +3372,7 @@
sql = NULL;
}
}
+#endif
SWITCH_DECLARE(void) switch_core_set_globals(void)
{
@@ -3553,11 +3555,12 @@
switch_core_db_exec(runtime.db, create_channels_sql, NULL, NULL, NULL);
switch_core_db_exec(runtime.db, create_calls_sql, NULL, NULL, NULL);
switch_core_db_exec(runtime.db, create_interfaces_sql, NULL, NULL, NULL);
-
+#ifdef DO_EVENTS
if (switch_event_bind("core_db", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, core_event_handler, NULL) !=
SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event handler!\n");
}
+#endif
}
runtime.session_id = 1;
Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c (original)
+++ freeswitch/trunk/src/switch_ivr.c Wed Sep 13 20:15:03 2006
@@ -580,6 +580,8 @@
return SWITCH_STATUS_SUCCESS;
}
+#define FILE_STARTSAMPLES 512 * 128
+#define FILE_BLOCKSIZE 1024
SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *session,
switch_file_handle_t *fh,
char *file,
@@ -589,7 +591,7 @@
unsigned int buflen)
{
switch_channel_t *channel;
- short abuf[960];
+ int16_t abuf[FILE_STARTSAMPLES+1];
char dtmf[128];
uint32_t interval = 0, samples = 0;
uint32_t ilen = 0;
@@ -676,6 +678,9 @@
assert(read_codec != NULL);
interval = read_codec->implementation->microseconds_per_frame / 1000;
+ if (!fh->audio_buffer) {
+ switch_buffer_create_dynamic(&fh->audio_buffer, FILE_BLOCKSIZE, (FILE_STARTSAMPLES * sizeof(int16_t)) + FILE_BLOCKSIZE, 0);
+ }
codec_name = "L16";
@@ -771,8 +776,10 @@
olen = ilen;
do_speed = 0;
} else {
- olen = ilen;
+ olen = FILE_STARTSAMPLES;
switch_core_file_read(fh, abuf, &olen);
+ switch_buffer_write(fh->audio_buffer, abuf, olen * 2);
+ olen = switch_buffer_read(fh->audio_buffer, abuf, ilen * 2) / 2;
}
if (done || olen <= 0) {
@@ -796,9 +803,6 @@
short *bp = write_frame.data;
switch_size_t wrote = 0;
- if (!fh->audio_buffer) {
- switch_buffer_create(fh->memory_pool, &fh->audio_buffer, SWITCH_RECCOMMENDED_BUFFER_SIZE);
- }
supplement = (int) (factor * olen);
newlen = (fh->speed > 0) ? olen - supplement : olen + supplement;
@@ -872,6 +876,7 @@
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done playing file\n");
switch_core_file_close(fh);
+ switch_buffer_destroy(&fh->audio_buffer);
switch_core_codec_destroy(&codec);
if (timer_name) {
Modified: freeswitch/trunk/src/switch_rtp.c
==============================================================================
--- freeswitch/trunk/src/switch_rtp.c (original)
+++ freeswitch/trunk/src/switch_rtp.c Wed Sep 13 20:15:03 2006
@@ -171,6 +171,8 @@
switch_payload_t te;
switch_mutex_t *flag_mutex;
switch_timer_t timer;
+ uint8_t ready;
+ switch_time_t last_time;
};
static int global_init = 0;
@@ -472,13 +474,15 @@
return SWITCH_STATUS_FALSE;
}
}
-
- if (!timer_name) {
- timer_name = "soft";
+ switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_USE_TIMER);
+ if (timer_name) {
+ if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, packet_size, rtp_session->pool) != SWITCH_STATUS_SUCCESS) {
+ return SWITCH_STATUS_FALSE;
+ }
+ switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_USE_TIMER);
}
- switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, packet_size, rtp_session->pool);
-
+ rtp_session->ready++;
*new_rtp_session = rtp_session;
return SWITCH_STATUS_SUCCESS;
@@ -556,13 +560,12 @@
SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session)
{
- return (rtp_session != NULL && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) ? 1 : 0;
+ return (rtp_session != NULL && rtp_session->ready) ? 1 : 0;
}
SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
{
-
- if (!switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_IO)) {
+ if (!switch_rtp_ready(*rtp_session)) {
return;
}
@@ -721,13 +724,13 @@
{
switch_size_t bytes;
switch_status_t status;
-
-
+ switch_time_t now = 0;
+
for(;;) {
bytes = sizeof(rtp_msg_t);
status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *)&rtp_session->recv_msg, &bytes);
- if (!SWITCH_STATUS_IS_BREAK(status)) {
+ if (!SWITCH_STATUS_IS_BREAK(status) && rtp_session->timer.timer_interface) {
switch_core_timer_step(&rtp_session->timer);
}
@@ -789,9 +792,12 @@
}
}
}
- if (switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS) {
+
+ if ((!rtp_session->timer.timer_interface && (now=switch_time_now()) - rtp_session->last_time > 10000) ||
+ switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS) {
do_2833(rtp_session);
-
+ rtp_session->last_time = now;
+
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) {
/* We're late! We're Late!*/
if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) {
More information about the Freeswitch-svn
mailing list