<!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][17215] </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=17215">17215</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-05 15:01:08 -0500 (Mon, 05 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the pendingchans queue only on request by signaling modules.
Remove suggest_chan_id member and add a span flag instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_isdnftmod_isdnc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_libpriftmod_libpric">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_typesh">freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17214 => 17215)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-05 20:01:08 UTC (rev 17215)
</span><span class="lines">@@ -412,7 +412,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* destroy final basic resources of the span data structure */
</span><del>- ftdm_queue_destroy(&span->pendingchans);
</del><ins>+ if (span->pendingchans) {
+ ftdm_queue_destroy(&span->pendingchans);
+ }
</ins><span class="cx"> ftdm_mutex_unlock(span->mutex);
</span><span class="cx"> ftdm_mutex_destroy(&span->mutex);
</span><span class="cx"> ftdm_safe_free(span->signal_data);
</span><span class="lines">@@ -518,9 +520,6 @@
</span><span class="cx"> status = ftdm_mutex_create(&new_span->mutex);
</span><span class="cx"> ftdm_assert(status == FTDM_SUCCESS, "mutex creation failed\n");
</span><span class="cx">
</span><del>- status = ftdm_queue_create(&new_span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
- ftdm_assert(status == FTDM_SUCCESS, "span chans queue creation failed\n");
-
</del><span class="cx"> ftdm_set_flag(new_span, FTDM_SPAN_CONFIGURED);
</span><span class="cx"> new_span->span_id = ++globals.span_index;
</span><span class="cx"> new_span->fio = fio;
</span><span class="lines">@@ -1163,7 +1162,9 @@
</span><span class="cx">
</span><span class="cx"> ftdm_mutex_lock(ftdmchan->span->mutex);
</span><span class="cx"> ftdm_set_flag(ftdmchan->span, FTDM_SPAN_STATE_CHANGE);
</span><del>- ftdm_queue_enqueue(ftdmchan->span->pendingchans, ftdmchan);
</del><ins>+ if (ftdmchan->span->pendingchans) {
+ ftdm_queue_enqueue(ftdmchan->span->pendingchans, ftdmchan);
+ }
</ins><span class="cx"> ftdm_mutex_unlock(ftdmchan->span->mutex);
</span><span class="cx">
</span><span class="cx"> ftdmchan->last_state = ftdmchan->state;
</span><span class="lines">@@ -1329,7 +1330,7 @@
</span><span class="cx"> return FTDM_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (span->channel_request && !span->suggest_chan_id) {
</del><ins>+ if (span->channel_request && !ftdm_test_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID)) {
</ins><span class="cx"> ftdm_set_caller_data(span, caller_data);
</span><span class="cx"> return span->channel_request(span, 0, direction, caller_data, ftdmchan);
</span><span class="cx"> }
</span><span class="lines">@@ -3266,6 +3267,9 @@
</span><span class="cx"> va_list ap;
</span><span class="cx"> va_start(ap, sig_cb);
</span><span class="cx"> status = mod->sig_configure(span, sig_cb, ap);
</span><ins>+ if (status == FTDM_SUCCESS && ftdm_test_flag(span, FTDM_SPAN_USE_CHAN_QUEUE)) {
+ status = ftdm_queue_create(&span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
+ }
</ins><span class="cx"> va_end(ap);
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "can't find '%s'\n", type);
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_isdnftmod_isdnc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c (17214 => 17215)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c 2010-04-05 20:01:08 UTC (rev 17215)
</span><span class="lines">@@ -2385,7 +2385,7 @@
</span><span class="cx">
</span><span class="cx"> if ((isdn_data->opts & FTDM_ISDN_OPT_SUGGEST_CHANNEL)) {
</span><span class="cx"> span->channel_request = isdn_channel_request;
</span><del>- span->suggest_chan_id = 1;
</del><ins>+ ftdm_set_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
</ins><span class="cx"> }
</span><span class="cx"> span->state_map = &isdn_state_map;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_libpriftmod_libpric"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c (17214 => 17215)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-05 20:01:08 UTC (rev 17215)
</span><span class="lines">@@ -1331,7 +1331,7 @@
</span><span class="cx">
</span><span class="cx"> if ((isdn_data->opts & FTMOD_LIBPRI_OPT_SUGGEST_CHANNEL)) {
</span><span class="cx"> span->channel_request = isdn_channel_request;
</span><del>- span->suggest_chan_id = 1;
</del><ins>+ ftdm_set_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> span->state_map = &isdn_state_map;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17214 => 17215)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-05 20:01:08 UTC (rev 17215)
</span><span class="lines">@@ -2239,7 +2239,8 @@
</span><span class="cx"> span->get_span_sig_status = sangoma_boost_get_span_sig_status;
</span><span class="cx"> span->set_span_sig_status = sangoma_boost_set_span_sig_status;
</span><span class="cx"> span->state_map = &boost_state_map;
</span><del>- span->suggest_chan_id = 0;
</del><ins>+ ftdm_clear_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
+ ftdm_set_flag(span, FTDM_SPAN_USE_CHAN_QUEUE);
</ins><span class="cx"> if (sigmod_iface) {
</span><span class="cx"> /* the core will do the hunting */
</span><span class="cx"> span->channel_request = NULL;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17214 => 17215)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-05 20:01:08 UTC (rev 17215)
</span><span class="lines">@@ -654,7 +654,6 @@
</span><span class="cx"> char *type;
</span><span class="cx"> char *dtmf_hangup;
</span><span class="cx"> size_t dtmf_hangup_len;
</span><del>- int suggest_chan_id;
</del><span class="cx"> ftdm_state_map_t *state_map;
</span><span class="cx"> ftdm_caller_data_t default_caller_data;
</span><span class="cx"> ftdm_queue_t *pendingchans;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h (17214 => 17215)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-05 20:01:08 UTC (rev 17215)
</span><span class="lines">@@ -325,7 +325,9 @@
</span><span class="cx"> FTDM_SPAN_STATE_CHANGE = (1 << 2),
</span><span class="cx"> FTDM_SPAN_SUSPENDED = (1 << 3),
</span><span class="cx"> FTDM_SPAN_IN_THREAD = (1 << 4),
</span><del>- FTDM_SPAN_STOP_THREAD = (1 << 5)
</del><ins>+ FTDM_SPAN_STOP_THREAD = (1 << 5),
+ FTDM_SPAN_USE_CHAN_QUEUE = (1 << 6),
+ FTDM_SPAN_SUGGEST_CHAN_ID = (1 << 7),
</ins><span class="cx"> } ftdm_span_flag_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>