<!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][16477] </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=16477">16477</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-23 00:53:30 -0600 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>omfg</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_bridgec">freeswitch/trunk/src/switch_ivr_bridge.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (16476 => 16477)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2010-01-23 06:50:13 UTC (rev 16476)
+++ freeswitch/trunk/src/switch_core_session.c 2010-01-23 06:53:30 UTC (rev 16477)
</span><span class="lines">@@ -985,10 +985,16 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_wake_session_thread(switch_core_session_t *session)
</span><span class="cx"> {
</span><ins>+ int x = 5;
</ins><span class="cx"> /* If trylock fails the signal is already awake so we needn't bother */
</span><del>- if (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) {
- switch_thread_cond_signal(session->cond);
- switch_mutex_unlock(session->mutex);
</del><ins>+ for(;;) {
+ if (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) {
+ switch_thread_cond_signal(session->cond);
+ switch_mutex_unlock(session->mutex);
+ return;
+ }
+ if (!--x) return;
+ switch_yield(1000);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (16476 => 16477)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2010-01-23 06:50:13 UTC (rev 16476)
+++ freeswitch/trunk/src/switch_ivr.c 2010-01-23 06:53:30 UTC (rev 16477)
</span><span class="lines">@@ -1216,6 +1216,8 @@
</span><span class="cx"> switch_assert(other_channel != NULL);
</span><span class="cx"> switch_core_session_receive_message(other_session, &msg);
</span><span class="cx"> switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL);
</span><ins>+ switch_channel_wait_for_flag(other_channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL);
+ switch_channel_wait_for_flag(other_channel, CF_MEDIA_SET, SWITCH_TRUE, 10000, NULL);
</ins><span class="cx"> switch_core_session_read_frame(other_session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
</span><span class="cx"> switch_channel_clear_state_handler(other_channel, NULL);
</span><span class="cx"> switch_core_session_rwunlock(other_session);
</span><span class="lines">@@ -1262,25 +1264,43 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_PROXY_MODE)) {
</span><ins>+ switch_channel_set_flag(channel, CF_REDIRECT);
+ switch_channel_set_state(channel, CS_PARK);
+ switch_channel_set_flag(channel, CF_TRANSFER);
+
</ins><span class="cx"> switch_core_session_receive_message(session, &msg);
</span><span class="cx">
</span><span class="cx"> if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) &&
</span><span class="cx"> (other_session = switch_core_session_locate(other_uuid))) {
</span><span class="cx"> other_channel = switch_core_session_get_channel(other_session);
</span><span class="cx">
</span><ins>+ switch_channel_set_flag(other_channel, CF_REDIRECT);
+ switch_channel_set_state(other_channel, CS_PARK);
+ switch_channel_set_flag(other_channel, CF_TRANSFER);
+
+
</ins><span class="cx"> switch_core_session_receive_message(other_session, &msg);
</span><span class="cx"> switch_channel_clear_state_handler(other_channel, NULL);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (other_channel) {
</span><ins>+ switch_channel_wait_for_state(other_channel, channel, CS_PARK);
+ }
+ switch_channel_wait_for_state_timeout(channel, CS_PARK, 5000000);
+
+ switch_channel_clear_flag(channel, CF_NOT_READY);
+
+ if (other_channel) {
+ switch_channel_clear_flag(other_channel, CF_NOT_READY);
+
</ins><span class="cx"> switch_channel_clear_state_handler(channel, NULL);
</span><span class="cx"> if (swap) {
</span><span class="cx"> switch_ivr_signal_bridge(other_session, session);
</span><span class="cx"> } else {
</span><span class="cx"> switch_ivr_signal_bridge(session, other_session);
</span><span class="cx"> }
</span><del>- switch_channel_wait_for_flag(channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL);
- switch_channel_wait_for_flag(other_channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL);
</del><ins>+ switch_channel_wait_for_state(other_channel, channel, CS_HIBERNATE);
+ switch_channel_wait_for_state(channel, other_channel, CS_HIBERNATE);
</ins><span class="cx"> switch_core_session_rwunlock(other_session);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_bridgec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_bridge.c (16476 => 16477)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_bridge.c 2010-01-23 06:50:13 UTC (rev 16476)
+++ freeswitch/trunk/src/switch_ivr_bridge.c 2010-01-23 06:53:30 UTC (rev 16477)
</span><span class="lines">@@ -891,7 +891,7 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!switch_channel_ready(caller_channel)) {
</del><ins>+ if (!switch_channel_up(caller_channel)) {
</ins><span class="cx"> switch_channel_hangup(peer_channel, SWITCH_CAUSE_ORIGINATOR_CANCEL);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -1192,9 +1192,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(caller_channel, CF_REDIRECT)) {
</span><del>- state = switch_channel_get_state(caller_channel);
- if (!(state == CS_RESET || state == CS_PARK || state == CS_ROUTING)) {
- switch_channel_set_state(caller_channel, CS_RESET);
</del><ins>+ if (switch_channel_test_flag(caller_channel, CF_RESET)) {
+ switch_channel_clear_flag(caller_channel, CF_RESET);
+ } else {
+ state = switch_channel_get_state(caller_channel);
+ if (!(state == CS_RESET || state == CS_PARK || state == CS_ROUTING)) {
+ switch_channel_set_state(caller_channel, CS_RESET);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>