<!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][16853] </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=16853">16853</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-01 13:25:27 -0600 (Mon, 01 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>compromising on timing code, remove -vm and make it default, make new -heavy-timing for previous default, change tipping-point to work of count of active timers rather than sessions, this should statisfy the droves of 'I wish it worked like 1.0.4 people'</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcswitchc">freeswitch/trunk/src/switch.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="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (16852 => 16853)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2010-03-01 15:30:58 UTC (rev 16852)
+++ freeswitch/trunk/src/include/switch_types.h 2010-03-01 19:25:27 UTC (rev 16853)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> SCF_USE_AUTO_NAT = (1 << 6),
</span><span class="cx"> SCF_EARLY_HANGUP = (1 << 7),
</span><span class="cx"> SCF_CALIBRATE_CLOCK = (1 << 8),
</span><del>- SCF_USE_COND_TIMING = (1 << 9),
</del><ins>+ SCF_USE_HEAVY_TIMING = (1 << 9),
</ins><span class="cx"> SCF_USE_CLOCK_RT = (1 << 10)
</span><span class="cx"> } switch_core_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_core_flag_t;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitchc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch.c (16852 => 16853)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch.c 2010-03-01 15:30:58 UTC (rev 16852)
+++ freeswitch/trunk/src/switch.c 2010-03-01 19:25:27 UTC (rev 16853)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> "\t-hp -- enable high priority settings\n"
</span><span class="cx"> "\t-vg -- run under valgrind\n"
</span><span class="cx"> "\t-nosql -- disable internal sql scoreboard\n"
</span><del>- "\t-vm -- use possibly more vm-friendly timing code.\n"
</del><ins>+ "\t-heavy-timer -- Heavy Timer, possibly more accurate but at a cost\n"
</ins><span class="cx"> "\t-nonat -- disable auto nat detection\n"
</span><span class="cx"> "\t-nocal -- disable clock calibration\n"
</span><span class="cx"> "\t-nort -- disable clock clock_realtime\n"
</span><span class="lines">@@ -485,8 +485,8 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (local_argv[x] && !strcmp(local_argv[x], "-vm")) {
- flags |= SCF_USE_COND_TIMING;
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-heavy-timer")) {
+ flags |= SCF_USE_HEAVY_TIMING;
</ins><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (16852 => 16853)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2010-03-01 15:30:58 UTC (rev 16852)
+++ freeswitch/trunk/src/switch_core.c 2010-03-01 19:25:27 UTC (rev 16853)
</span><span class="lines">@@ -1286,6 +1286,8 @@
</span><span class="cx">
</span><span class="cx"> switch_log_init(runtime.memory_pool, runtime.colorize_console);
</span><span class="cx">
</span><ins>+ runtime.tipping_point = 1500;
+ runtime.timer_affinity = -1;
</ins><span class="cx"> switch_load_core_config("switch.conf");
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1300,8 +1302,6 @@
</span><span class="cx"> switch_rtp_init(runtime.memory_pool);
</span><span class="cx">
</span><span class="cx"> runtime.running = 1;
</span><del>- runtime.tipping_point = 1000000;
- runtime.timer_affinity = -1;
</del><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></pre></div>
<a id="freeswitchtrunksrcswitch_timec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_time.c (16852 => 16853)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_time.c 2010-03-01 15:30:58 UTC (rev 16852)
+++ freeswitch/trunk/src/switch_time.c 2010-03-01 19:25:27 UTC (rev 16853)
</span><span class="lines">@@ -63,15 +63,22 @@
</span><span class="cx">
</span><span class="cx"> static int OFFSET = 0;
</span><span class="cx">
</span><del>-static int COND = 0;
</del><ins>+static int COND = 1;
</ins><span class="cx">
</span><span class="cx"> static int MATRIX = 1;
</span><span class="cx">
</span><ins>+#define ONEMS
+#ifdef ONEMS
+static int STEP_MS = 1;
+static int STEP_MIC = 1000;
+static uint32_t TICK_PER_SEC = 10000;
+static int MS_PER_TICK = 1;
+#else
</ins><span class="cx"> static int STEP_MS = 10;
</span><span class="cx"> static int STEP_MIC = 10000;
</span><span class="cx"> static uint32_t TICK_PER_SEC = 1000;
</span><del>-
</del><span class="cx"> static int MS_PER_TICK = 10;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static switch_memory_pool_t *module_pool = NULL;
</span><span class="cx">
</span><span class="lines">@@ -80,6 +87,7 @@
</span><span class="cx"> int32_t STARTED;
</span><span class="cx"> int32_t use_cond_yield;
</span><span class="cx"> switch_mutex_t *mutex;
</span><ins>+ uint32_t timer_count;
</ins><span class="cx"> } globals;
</span><span class="cx">
</span><span class="cx"> #ifdef WIN32
</span><span class="lines">@@ -375,7 +383,7 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) switch_cond_next(void)
</span><span class="cx"> {
</span><del>- if (session_manager.session_count > runtime.tipping_point) {
</del><ins>+ if (globals.timer_count >= runtime.tipping_point) {
</ins><span class="cx"> os_yield();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -451,6 +459,13 @@
</span><span class="cx"> switch_time_sync();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_mutex_lock(globals.mutex);
+ globals.timer_count++;
+ if (globals.timer_count == (runtime.tipping_point + 1)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Crossed tipping point of %u, shifting into high-gear.\n", runtime.tipping_point);
+ }
+ switch_mutex_unlock(globals.mutex);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -532,8 +547,9 @@
</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 (session_manager.session_count > runtime.tipping_point) {
</del><ins>+ if (globals.timer_count >= runtime.tipping_point) {
</ins><span class="cx"> os_yield();
</span><ins>+ globals.use_cond_yield = 0;
</ins><span class="cx"> } else {
</span><span class="cx"> if (globals.use_cond_yield == 1) {
</span><span class="cx"> switch_mutex_lock(TIMER_MATRIX[cond_index].mutex);
</span><span class="lines">@@ -594,6 +610,16 @@
</span><span class="cx"> if (private_info) {
</span><span class="cx"> private_info->ready = 0;
</span><span class="cx"> }
</span><ins>+
+ switch_mutex_lock(globals.mutex);
+ if (globals.timer_count) {
+ globals.timer_count--;
+ if (globals.timer_count == (runtime.tipping_point - 1)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Fell Below tipping point of %u, shifting into low-gear.\n", runtime.tipping_point);
+ }
+ }
+ switch_mutex_unlock(globals.mutex);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -676,7 +702,7 @@
</span><span class="cx"> rev_errs = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (session_manager.session_count > runtime.tipping_point) {
</del><ins>+ if (globals.timer_count >= runtime.tipping_point) {
</ins><span class="cx"> os_yield();
</span><span class="cx"> } else {
</span><span class="cx"> do_sleep(1000);
</span><span class="lines">@@ -987,8 +1013,8 @@
</span><span class="cx"> switch_time_set_nanosleep(SWITCH_FALSE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (switch_test_flag((&runtime), SCF_USE_COND_TIMING)) {
- switch_time_set_cond_yield(SWITCH_TRUE);
</del><ins>+ if (switch_test_flag((&runtime), SCF_USE_HEAVY_TIMING)) {
+ switch_time_set_cond_yield(SWITCH_FALSE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag((&runtime), SCF_CALIBRATE_CLOCK)) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>