<!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][17431] </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=17431">17431</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-04-28 12:59:29 -0500 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix potential excess cpu usage during originate</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17430 => 17431)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-28 17:57:05 UTC (rev 17430)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-28 17:59:29 UTC (rev 17431)
</span><span class="lines">@@ -3874,7 +3874,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free(stream.data);
</span><ins>+
</ins><span class="cx"> switch_core_session_rwunlock(a_session);
</span><ins>+ switch_channel_hangup(channel, SWITCH_CAUSE_REDIRECTION_TO_NEW_DESTINATION);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> su_home_t *home = su_home_new(sizeof(*home));
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (17430 => 17431)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2010-04-28 17:57:05 UTC (rev 17430)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2010-04-28 17:59:29 UTC (rev 17431)
</span><span class="lines">@@ -702,7 +702,8 @@
</span><span class="cx">
</span><span class="cx"> end:
</span><span class="cx">
</span><del>- if (pindex > -1 && caller_channel && switch_channel_ready(caller_channel) && !switch_channel_media_ready(caller_channel)) {
</del><ins>+ if (pindex > -1 && caller_channel && switch_channel_ready(caller_channel) && !switch_channel_media_ready(caller_channel) &&
+ switch_channel_media_ready(originate_status[pindex].peer_channel)) {
</ins><span class="cx"> inherit_codec(caller_channel, originate_status[pindex].peer_session);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1750,7 +1751,8 @@
</span><span class="cx"> const char *soft_holding = NULL;
</span><span class="cx"> const char *export_vars = NULL;
</span><span class="cx"> early_state_t early_state = { 0 };
</span><del>-
</del><ins>+ int read_packet = 0;
+
</ins><span class="cx"> if (strstr(bridgeto, SWITCH_ENT_ORIGINATE_DELIM)) {
</span><span class="cx"> return switch_ivr_enterprise_originate(session, bleg, cause, bridgeto, timelimit_sec, table, cid_name_override, cid_num_override,
</span><span class="cx"> caller_profile_override, ovars, flags);
</span><span class="lines">@@ -2708,6 +2710,8 @@
</span><span class="cx"> while ((!caller_channel || switch_channel_ready(caller_channel) || switch_channel_test_flag(caller_channel, CF_XFER_ZOMBIE)) &&
</span><span class="cx"> check_channel_status(&oglobals, originate_status, and_argc)) {
</span><span class="cx"> time_t elapsed = switch_epoch_time_now(NULL) - start;
</span><ins>+
+ read_packet = 0;
</ins><span class="cx">
</span><span class="cx"> if (cancel_cause && *cancel_cause > 0) {
</span><span class="cx"> if (force_reason == SWITCH_CAUSE_NONE) {
</span><span class="lines">@@ -2741,7 +2745,7 @@
</span><span class="cx"> const char *cause_str;
</span><span class="cx">
</span><span class="cx"> if (!originate_status[i].peer_session) {
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx"> pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
</span><span class="cx">
</span><span class="lines">@@ -2791,10 +2795,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(caller_channel, CF_XFER_ZOMBIE)) {
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ read_packet++;
</ins><span class="cx"> } else {
</span><span class="cx"> read_frame = NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -2838,7 +2844,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (oglobals.bridge_early_media > -1) {
</span><span class="lines">@@ -2897,7 +2903,7 @@
</span><span class="cx">
</span><span class="cx"> if (soft_holding) {
</span><span class="cx"> switch_channel_set_flag(caller_channel, CF_XFER_ZOMBIE);
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="lines">@@ -2920,16 +2926,19 @@
</span><span class="cx"> switch_channel_set_flag(caller_channel, CF_XFER_ZOMBIE);
</span><span class="cx"> }
</span><span class="cx"> if (switch_channel_test_flag(caller_channel, CF_XFER_ZOMBIE)) {
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- } else {
</del><ins>+ }
+
+ do_continue:
+
+ if (!read_packet) {
</ins><span class="cx"> switch_cond_next();
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> notready:
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>