<!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][16278] </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=16278">16278</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-13 12:02:42 -0600 (Wed, 13 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODAPP-387">MODAPP-387</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc">freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_fifomod_fifoc">freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc">freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_limitmod_limitc">freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sqldbc">freeswitch/trunk/src/switch_core_sqldb.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_timec">freeswitch/trunk/src/switch_time.c</a></li>
<li><a href="#freeswitchtrunksupportdbashrc">freeswitch/trunk/support-d/.bashrc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> switch_cache_db_connection_options_t options = { {0} };
</span><span class="cx"> switch_cache_db_handle_t *dbh = NULL;
</span><span class="cx">
</span><del>- if (globals.odbc_dsn && globals.odbc_user && globals.odbc_pass) {
</del><ins>+ if (!zstr(globals.odbc_dsn)) {
</ins><span class="cx"> options.odbc_options.dsn = globals.odbc_dsn;
</span><span class="cx"> options.odbc_options.user = globals.odbc_user;
</span><span class="cx"> options.odbc_options.pass = globals.odbc_pass;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_fifomod_fifoc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> switch_cache_db_connection_options_t options = { {0} };
</span><span class="cx"> switch_cache_db_handle_t *dbh = NULL;
</span><span class="cx">
</span><del>- if (globals.odbc_dsn && globals.odbc_user && globals.odbc_pass) {
</del><ins>+ if (!zstr(globals.odbc_dsn)) {
</ins><span class="cx"> options.odbc_options.dsn = globals.odbc_dsn;
</span><span class="cx"> options.odbc_options.user = globals.odbc_user;
</span><span class="cx"> options.odbc_options.pass = globals.odbc_pass;
</span><span class="lines">@@ -1873,8 +1873,6 @@
</span><span class="cx"> {
</span><span class="cx"> char *cf = "fifo.conf";
</span><span class="cx"> switch_xml_t cfg, xml, fifo, fifos, member, settings, param;
</span><del>- char *odbc_user = NULL;
- char *odbc_pass = NULL;
</del><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> char *sql;
</span><span class="cx"> switch_bool_t delete_all_outbound_member_on_startup = SWITCH_FALSE;
</span><span class="lines">@@ -1913,7 +1911,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (zstr(globals.odbc_dsn) || zstr(odbc_user) || zstr(odbc_pass)) {
</del><ins>+ if (zstr(globals.odbc_dsn)) {
</ins><span class="cx"> globals.dbname = "fifo";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> switch_cache_db_connection_options_t options = { {0} };
</span><span class="cx"> switch_cache_db_handle_t *dbh = NULL;
</span><span class="cx">
</span><del>- if (globals.odbc_dsn && globals.odbc_user && globals.odbc_pass) {
</del><ins>+ if (!zstr(globals.odbc_dsn)) {
</ins><span class="cx"> options.odbc_options.dsn = globals.odbc_dsn;
</span><span class="cx"> options.odbc_options.user = globals.odbc_user;
</span><span class="cx"> options.odbc_options.pass = globals.odbc_pass;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_limitmod_limitc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> switch_cache_db_connection_options_t options = { {0} };
</span><span class="cx"> switch_cache_db_handle_t *dbh = NULL;
</span><span class="cx">
</span><del>- if (globals.odbc_dsn && globals.odbc_user && globals.odbc_pass) {
</del><ins>+ if (!zstr(globals.odbc_dsn)) {
</ins><span class="cx"> options.odbc_options.dsn = globals.odbc_dsn;
</span><span class="cx"> options.odbc_options.user = globals.odbc_user;
</span><span class="cx"> options.odbc_options.pass = globals.odbc_pass;
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- if (zstr(globals.odbc_dsn) || zstr(globals.odbc_user) || zstr(globals.odbc_pass)) {
</del><ins>+ if (zstr(globals.odbc_dsn)) {
</ins><span class="cx"> globals.dbname = "call_limit";
</span><span class="cx"> dbh = limit_get_db_handle();
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> switch_cache_db_connection_options_t options = { {0} };
</span><span class="cx"> switch_cache_db_handle_t *dbh = NULL;
</span><span class="cx">
</span><del>- if (profile->odbc_dsn && profile->odbc_user && profile->odbc_pass) {
</del><ins>+ if (!zstr(profile->odbc_dsn)) {
</ins><span class="cx"> options.odbc_options.dsn = profile->odbc_dsn;
</span><span class="cx"> options.odbc_options.user = profile->odbc_user;
</span><span class="cx"> options.odbc_options.pass = profile->odbc_pass;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -4208,7 +4208,7 @@
</span><span class="cx"> switch_cache_db_connection_options_t options = { {0} };
</span><span class="cx"> switch_cache_db_handle_t *dbh = NULL;
</span><span class="cx">
</span><del>- if (profile->odbc_dsn && profile->odbc_user && profile->odbc_pass) {
</del><ins>+ if (!zstr(profile->odbc_dsn)) {
</ins><span class="cx"> options.odbc_options.dsn = profile->odbc_dsn;
</span><span class="cx"> options.odbc_options.user = profile->odbc_user;
</span><span class="cx"> options.odbc_options.pass = profile->odbc_pass;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> switch_cache_db_connection_options_t options = { {0} };
</span><span class="cx"> switch_status_t r;
</span><span class="cx">
</span><del>- if (runtime.odbc_dsn && runtime.odbc_user && runtime.odbc_pass) {
</del><ins>+ if (!zstr(runtime.odbc_dsn)) {
</ins><span class="cx"> options.odbc_options.dsn = runtime.odbc_dsn;
</span><span class="cx"> options.odbc_options.user = runtime.odbc_user;
</span><span class="cx"> options.odbc_options.pass = runtime.odbc_pass;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_timec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_time.c (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_time.c 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/src/switch_time.c 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -176,29 +176,39 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#define calc_step() if ((step - 10) > 10) step -= 10; else if (step > 1) step--
</ins><span class="cx"> static void calibrate_clock(void)
</span><span class="cx"> {
</span><span class="cx"> int x;
</span><span class="cx"> switch_interval_time_t avg, val = 1000, want = 1000;
</span><del>- int over = 0, under = 0, good = 0;
</del><ins>+ int over = 0, under = 0, good = 0, step = 50;
</ins><span class="cx">
</span><span class="cx"> for (x = 0; x < 500; x++) {
</span><span class="cx"> avg = average_time(val, 100);
</span><del>-
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Test: %ld Average: %ld Step: %d\n", val, avg, step);
+
</ins><span class="cx"> if (abs((int)(want - avg)) <= 2) {
</span><ins>+ under = over = 0;
</ins><span class="cx"> if (++good > 10) {
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> } else if (avg > want) {
</span><del>- val--;
- over++;
</del><ins>+ under = 0;
+ val -= step;
+ if (++over > 3) {
+ calc_step();
+ }
</ins><span class="cx"> } else if (avg < want) {
</span><del>- val++;
- under++;
</del><ins>+ over = 0;
+ val += step;
+ if (++under > 3) {
+ calc_step();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OFFSET = (int)(want - val);
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Timer offset of %d calculated\n", OFFSET);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -289,7 +299,7 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- if (!globals.RUNNING || t < 1000 || t >= 10000) {
</del><ins>+ if (globals.RUNNING != 1 || t < 1000 || t >= 10000) {
</ins><span class="cx"> do_sleep(t);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -580,7 +590,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- calibrate_clock();
</del><ins>+
</ins><span class="cx"> switch_time_sync();
</span><span class="cx">
</span><span class="cx"> globals.use_cond_yield = COND;
</span><span class="lines">@@ -917,6 +927,9 @@
</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><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Calibrating timer, please wait...\n");
+ calibrate_clock();
+
</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>
<a id="freeswitchtrunksupportdbashrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/support-d/.bashrc (16277 => 16278)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/support-d/.bashrc 2010-01-13 17:01:36 UTC (rev 16277)
+++ freeswitch/trunk/support-d/.bashrc 2010-01-13 18:02:42 UTC (rev 16278)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> alias bcommit='svn commit --no-auth-cache --username=brian'
</span><span class="cx"> alias icommit='svn commit --no-auth-cache --username=intralanman'
</span><span class="cx"> alias dp='emacs /usr/local/freeswitch/conf/dialplan/default.xml'
</span><del>-alias fstop='top -p `cat /usr/local/freeswitch/log/freeswitch.pid`'
-alias fsgdb='gdb /usr/local/freeswitch/bin/freeswitch `cat /usr/local/freeswitch/log/freeswitch.pid`'
</del><ins>+alias fstop='top -p `cat /usr/local/freeswitch/run/freeswitch.pid`'
+alias fsgdb='gdb /usr/local/freeswitch/bin/freeswitch `cat /usr/local/freeswitch/run/freeswitch.pid`'
</ins><span class="cx"> alias fscore='gdb /usr/local/freeswitch/bin/freeswitch `ls -rt core.* | tail -n1`'
</span><span class="cx"> alias emacs='emacs -nw'
</span><span class="cx"> # End of file
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>