<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16308] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16308">16308</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-14 10:02:46 -0600 (Thu, 14 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>switch to conditional broadcast mode on slow kernels</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeprivateswitch_core_pvth">freeswitch/trunk/src/include/private/switch_core_pvt.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_timec">freeswitch/trunk/src/switch_time.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeprivateswitch_core_pvth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h (16307 => 16308)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/private/switch_core_pvt.h 2010-01-14 14:39:57 UTC (rev 16307)
+++ freeswitch/trunk/src/include/private/switch_core_pvt.h 2010-01-14 16:02:46 UTC (rev 16308)
</span><span class="lines">@@ -215,6 +215,7 @@
</span><span class="cx"> char *odbc_pass;
</span><span class="cx"> uint32_t debug_level;
</span><span class="cx"> uint32_t runlevel;
</span><ins>+ uint32_t tipping_point;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> extern struct switch_runtime runtime;
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (16307 => 16308)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2010-01-14 14:39:57 UTC (rev 16307)
+++ freeswitch/trunk/src/include/switch_core.h 2010-01-14 16:02:46 UTC (rev 16308)
</span><span class="lines">@@ -1238,6 +1238,8 @@
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_timer_init(switch_timer_t *timer, const char *timer_name, int interval, int samples,
</span><span class="cx"> switch_memory_pool_t *pool);
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(void) switch_time_calibrate_clock(void);
+
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Wait for one cycle on an existing timer
</span><span class="cx"> \param timer the timer to wait on
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (16307 => 16308)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2010-01-14 14:39:57 UTC (rev 16307)
+++ freeswitch/trunk/src/include/switch_types.h 2010-01-14 16:02:46 UTC (rev 16308)
</span><span class="lines">@@ -1436,7 +1436,8 @@
</span><span class="cx"> SCSC_SEND_SIGHUP,
</span><span class="cx"> SCSC_DEBUG_LEVEL,
</span><span class="cx"> SCSC_FLUSH_DB_HANDLES,
</span><del>- SCSC_SHUTDOWN_NOW
</del><ins>+ SCSC_SHUTDOWN_NOW,
+ SCSC_CALIBRATE_CLOCK
</ins><span class="cx"> } switch_session_ctl_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (16307 => 16308)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-01-14 14:39:57 UTC (rev 16307)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-01-14 16:02:46 UTC (rev 16308)
</span><span class="lines">@@ -1470,6 +1470,8 @@
</span><span class="cx"> arg = 0;
</span><span class="cx"> switch_core_session_ctl(SCSC_PAUSE_INBOUND, &arg);
</span><span class="cx"> stream->write_function(stream, "+OK\n");
</span><ins>+ } else if (!strcasecmp(argv[0], "calibrate_clock")) {
+ switch_core_session_ctl(SCSC_CALIBRATE_CLOCK, NULL);
</ins><span class="cx"> } else if (!strcasecmp(argv[0], "shutdown")) {
</span><span class="cx"> switch_session_ctl_t command = SCSC_SHUTDOWN;
</span><span class="cx"> int x = 0;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (16307 => 16308)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2010-01-14 14:39:57 UTC (rev 16307)
+++ freeswitch/trunk/src/switch_core.c 2010-01-14 16:02:46 UTC (rev 16308)
</span><span class="lines">@@ -1301,7 +1301,7 @@
</span><span class="cx"> switch_rtp_init(runtime.memory_pool);
</span><span class="cx">
</span><span class="cx"> runtime.running = 1;
</span><del>-
</del><ins>+ runtime.tipping_point = 1000;
</ins><span class="cx"> runtime.initiated = switch_time_now();
</span><span class="cx">
</span><span class="cx"> switch_scheduler_add_task(switch_epoch_time_now(NULL), heartbeat_callback, "heartbeat", "core", 0, NULL, SSHF_NONE | SSHF_NO_DEL);
</span><span class="lines">@@ -1442,6 +1442,8 @@
</span><span class="cx"> switch_time_set_matrix(switch_true(var));
</span><span class="cx"> } else if (!strcasecmp(var, "max-sessions") && !zstr(val)) {
</span><span class="cx"> switch_core_session_limit(atoi(val));
</span><ins>+ } else if (!strcasecmp(var, "tipping-point") && !zstr(val)) {
+ runtime.tipping_point = atoi(val);
</ins><span class="cx"> } else if (!strcasecmp(var, "rtp-start-port") && !zstr(val)) {
</span><span class="cx"> switch_rtp_set_start_port((switch_port_t) atoi(val));
</span><span class="cx"> } else if (!strcasecmp(var, "rtp-end-port") && !zstr(val)) {
</span><span class="lines">@@ -1605,6 +1607,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (cmd) {
</span><ins>+ case SCSC_CALIBRATE_CLOCK:
+ switch_time_calibrate_clock();
+ break;
</ins><span class="cx"> case SCSC_FLUSH_DB_HANDLES:
</span><span class="cx"> switch_cache_db_flush_handles();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_timec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_time.c (16307 => 16308)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_time.c 2010-01-14 14:39:57 UTC (rev 16307)
+++ freeswitch/trunk/src/switch_time.c 2010-01-14 16:02:46 UTC (rev 16308)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define calc_step() if (step > 11) step -= 10; else if (step > 1) step--
</span><del>-static void calibrate_clock(void)
</del><ins>+SWITCH_DECLARE(void) switch_time_calibrate_clock(void)
</ins><span class="cx"> {
</span><span class="cx"> int x;
</span><span class="cx"> switch_interval_time_t avg, val = 1000, want = 1000;
</span><span class="lines">@@ -188,15 +188,18 @@
</span><span class="cx"> clock_getres(CLOCK_MONOTONIC, &ts);
</span><span class="cx"> if (ts.tv_nsec / 1000 > 1500) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</span><del>- "Timer resolution of %ld microseconds detected!\n"
- "Do you have your kernel timer set to higher than 1khz? You may experience audio problems.\n", ts.tv_nsec / 1000);
- sleep(5);
</del><ins>+ "Timer resolution of %ld microseconds detected!\n"
+ "Do you have your kernel timer set to higher than 1khz? You may experience audio problems.\n", ts.tv_nsec / 1000);
+ do_sleep(5000000);
+ switch_time_set_cond_yield(SWITCH_TRUE);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ OFFSET = 0;
+
</ins><span class="cx"> for (x = 0; x < 500; x++) {
</span><del>- avg = average_time(val, 100);
</del><ins>+ avg = average_time(val, 50);
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Test: %ld Average: %ld Step: %d\n", (long)val, (long)avg, step);
</span><span class="cx">
</span><span class="cx"> diff = abs((int)(want - avg));
</span><span class="lines">@@ -204,11 +207,8 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</span><span class="cx"> "Abnormally large timer gap %d detected!\n"
</span><span class="cx"> "Do you have your kernel timer set to higher than 1khz? You may experience audio problems.\n", diff);
</span><del>-#ifdef WIN32
- Sleep(5*1000);
-#else
- sleep(5);
-#endif
</del><ins>+ do_sleep(5000000);
+ switch_time_set_cond_yield(SWITCH_TRUE);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -220,12 +220,12 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (avg > want) {
</span><span class="cx"> if (under) {calc_step();}
</span><del>- under = 0;
</del><ins>+ under = good = 0;
</ins><span class="cx"> val -= step;
</span><span class="cx"> over++;
</span><span class="cx"> } else if (avg < want) {
</span><span class="cx"> if (over) {calc_step();}
</span><del>- over = 0;
</del><ins>+ over = good = 0;
</ins><span class="cx"> val += step;
</span><span class="cx"> under++;
</span><span class="cx"> }
</span><span class="lines">@@ -261,15 +261,6 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_time_set_matrix(switch_bool_t enable)
</span><span class="cx"> {
</span><span class="cx"> MATRIX = enable ? 1 : 0;
</span><del>- if (MATRIX) {
- STEP_MS = 1;
- STEP_MIC = 1000;
- TICK_PER_SEC = 10000;
- } else {
- STEP_MS = 10;
- STEP_MIC = 10000;
- TICK_PER_SEC = 1000;
- }
</del><span class="cx"> switch_time_sync();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -286,6 +277,7 @@
</span><span class="cx"> if (COND) {
</span><span class="cx"> MATRIX = 1;
</span><span class="cx"> }
</span><ins>+ switch_time_sync();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_time_t time_now(int64_t offset)
</span><span class="lines">@@ -498,15 +490,15 @@
</span><span class="cx"> while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) {
</span><span class="cx"> check_roll();
</span><span class="cx">
</span><del>- if (globals.use_cond_yield == 1) {
- switch_mutex_lock(TIMER_MATRIX[cond_index].mutex);
- if (TIMER_MATRIX[timer->interval].tick < private_info->reference) {
- switch_thread_cond_wait(TIMER_MATRIX[cond_index].cond, TIMER_MATRIX[cond_index].mutex);
- }
- switch_mutex_unlock(TIMER_MATRIX[cond_index].mutex);
</del><ins>+ if (session_manager.session_count > runtime.tipping_point) {
+ os_yield();
</ins><span class="cx"> } else {
</span><del>- if (session_manager.session_count > 1000) {
- os_yield();
</del><ins>+ if (globals.use_cond_yield == 1) {
+ switch_mutex_lock(TIMER_MATRIX[cond_index].mutex);
+ if (TIMER_MATRIX[timer->interval].tick < private_info->reference) {
+ switch_thread_cond_wait(TIMER_MATRIX[cond_index].cond, TIMER_MATRIX[cond_index].mutex);
+ }
+ switch_mutex_unlock(TIMER_MATRIX[cond_index].mutex);
</ins><span class="cx"> } else {
</span><span class="cx"> do_sleep(1000);
</span><span class="cx"> }
</span><span class="lines">@@ -640,10 +632,10 @@
</span><span class="cx"> rev_errs = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (session_manager.session_count > 1000) {
</del><ins>+ if (session_manager.session_count > runtime.tipping_point) {
</ins><span class="cx"> os_yield();
</span><span class="cx"> } else {
</span><del>- do_sleep(STEP_MIC);
</del><ins>+ do_sleep(1000);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> last = ts;
</span><span class="lines">@@ -952,7 +944,7 @@
</span><span class="cx"> timer_interface->timer_destroy = timer_destroy;
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Calibrating timer, please wait...\n");
</span><del>- calibrate_clock();
</del><ins>+ switch_time_calibrate_clock();
</ins><span class="cx">
</span><span class="cx"> /* indicate that the module should continue to be loaded */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>