<!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][16324] </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=16324">16324</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-15 15:09:51 -0600 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>few new command line opts -vm for conditonal timer, -nocal to skip timer calibration and -nort to turn off clock_realtime fam of functions</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_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 (16323 => 16324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2010-01-15 18:06:17 UTC (rev 16323)
+++ freeswitch/trunk/src/include/switch_types.h 2010-01-15 21:09:51 UTC (rev 16324)
</span><span class="lines">@@ -242,7 +242,10 @@
</span><span class="cx"> SCF_RESTART = (1 << 4),
</span><span class="cx"> SCF_SHUTDOWN_REQUESTED = (1 << 5),
</span><span class="cx"> SCF_USE_AUTO_NAT = (1 << 6),
</span><del>- SCF_EARLY_HANGUP = (1 << 7)
</del><ins>+ SCF_EARLY_HANGUP = (1 << 7),
+ SCF_CALIBRATE_CLOCK = (1 << 8),
+ SCF_USE_COND_TIMING = (1 << 9),
+ SCF_USE_CLOCK_RT = (1 << 10)
</ins><span class="cx"> } switch_core_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_core_flag_t;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitchc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch.c (16323 => 16324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch.c 2010-01-15 18:06:17 UTC (rev 16323)
+++ freeswitch/trunk/src/switch.c 2010-01-15 21:09:51 UTC (rev 16324)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> /* the main service entry point */
</span><span class="cx"> void WINAPI service_main(DWORD numArgs, char **args)
</span><span class="cx"> {
</span><del>- switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT;
</del><ins>+ switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT | SCF_CALIBRATE_CLOCK | SCF_USE_CLOCK_RT;
</ins><span class="cx"> const char *err = NULL; /* error value for return from freeswitch initialization */
</span><span class="cx"> /* we have to initialize the service-specific stuff */
</span><span class="cx"> memset(&status, 0, sizeof(SERVICE_STATUS));
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> #ifdef __sun
</span><span class="cx"> switch_core_flag_t flags = SCF_USE_SQL;
</span><span class="cx"> #else
</span><del>- switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT;
</del><ins>+ switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT | SCF_CALIBRATE_CLOCK | SCF_USE_CLOCK_RT;
</ins><span class="cx"> #endif
</span><span class="cx"> int ret = 0;
</span><span class="cx"> switch_status_t destroy_status;
</span><span class="lines">@@ -328,7 +328,10 @@
</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><ins>+ "\t-vm -- use possibly more vm-friendly timing code.\n"
</ins><span class="cx"> "\t-nonat -- disable auto nat detection\n"
</span><ins>+ "\t-nocal -- disable clock calibration\n"
+ "\t-nort -- disable clock clock_realtime\n"
</ins><span class="cx"> "\t-stop -- stop freeswitch\n"
</span><span class="cx"> "\t-nc -- do not output to a console and background\n"
</span><span class="cx"> "\t-c -- output to a console and stay in the foreground\n"
</span><span class="lines">@@ -492,6 +495,21 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-vm")) {
+ flags |= SCF_USE_COND_TIMING;
+ known_opt++;
+ }
+
+ if (local_argv[x] && !strcmp(local_argv[x], "-nort")) {
+ flags &= ~SCF_USE_CLOCK_RT;
+ known_opt++;
+ }
+
+ if (local_argv[x] && !strcmp(local_argv[x], "-nocal")) {
+ flags &= ~SCF_CALIBRATE_CLOCK;
+ known_opt++;
+ }
+
</ins><span class="cx"> if (local_argv[x] && !strcmp(local_argv[x], "-vg")) {
</span><span class="cx"> flags |= SCF_VG;
</span><span class="cx"> known_opt++;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_timec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_time.c (16323 => 16324)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_time.c 2010-01-15 18:06:17 UTC (rev 16323)
+++ freeswitch/trunk/src/switch_time.c 2010-01-15 21:09:51 UTC (rev 16324)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> OFFSET = 0;
</span><span class="cx">
</span><del>- for (x = 0; x < 500; x++) {
</del><ins>+ for (x = 0; x < 100; x++) {
</ins><span class="cx"> avg = average_time(val, 50);
</span><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="lines">@@ -231,8 +231,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OFFSET = (int)(want - val);
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Timer offset of %d calculated\n", OFFSET);
</del><ins>+ if (good >= 10) {
+ OFFSET = (int)(want - val);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Timer offset of %d calculated\n", OFFSET);
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Timer offset of NOT calculated\n");
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -943,9 +947,21 @@
</span><span class="cx"> timer_interface->timer_check = timer_check;
</span><span class="cx"> timer_interface->timer_destroy = timer_destroy;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Calibrating timer, please wait...\n");
- switch_time_calibrate_clock();
</del><ins>+ if (!switch_test_flag((&runtime), SCF_USE_CLOCK_RT)) {
+ switch_time_set_nanosleep(SWITCH_FALSE);
+ }
+
+ if (!switch_test_flag((&runtime), SCF_USE_COND_TIMING)) {
+ switch_time_set_cond_yield(SWITCH_TRUE);
+ }
</ins><span class="cx">
</span><ins>+ if (switch_test_flag((&runtime), SCF_CALIBRATE_CLOCK)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Calibrating timer, please wait...\n");
+ switch_time_calibrate_clock();
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clock calibration disabled.\n");
+ }
+
</ins><span class="cx"> /* indicate that the module should continue to be loaded */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>