<!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][17522] </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=17522">17522</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-05-11 09:42:32 -0500 (Tue, 11 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: shutdown boost events thread on unload</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftdm_sangoma_boosth">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftdm_sangoma_boosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h (17521 => 17522)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h 2010-05-11 20:38:58 UTC (rev 17521)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h 2010-05-11 14:42:32 UTC (rev 17522)
</span><span class="lines">@@ -40,7 +40,8 @@
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> FTDM_SANGOMA_BOOST_RUNNING = (1 << 0),
</span><del>- FTDM_SANGOMA_BOOST_RESTARTING = (1 << 1)
</del><ins>+ FTDM_SANGOMA_BOOST_RESTARTING = (1 << 1),
+ FTDM_SANGOMA_BOOST_EVENTS_RUNNING = (1 << 2),
</ins><span class="cx"> } ftdm_sangoma_boost_flag_t;
</span><span class="cx">
</span><span class="cx"> typedef struct ftdm_sangoma_boost_data {
</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 (17521 => 17522)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-05-11 20:38:58 UTC (rev 17521)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-05-11 14:42:32 UTC (rev 17522)
</span><span class="lines">@@ -1721,19 +1721,23 @@
</span><span class="cx"> */
</span><span class="cx"> static void *ftdm_sangoma_events_run(ftdm_thread_t *me, void *obj)
</span><span class="cx"> {
</span><del>- ftdm_span_t *span = (ftdm_span_t *) obj;
</del><ins>+ ftdm_span_t *span = (ftdm_span_t *) obj;
</ins><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
</span><span class="cx"> unsigned errs = 0;
</span><span class="cx">
</span><del>- while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING) && ftdm_running()) {
- if (check_events(span,100) != FTDM_SUCCESS) {
</del><ins>+ while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING) && ftdm_running()) {
+ if (check_events(span, 100) != FTDM_SUCCESS) {
</ins><span class="cx"> if (errs++ > 50) {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Too many event errors, quitting sangoma events thread\n");
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ ftdm_log(FTDM_LOG_DEBUG, "Sangoma Boost Events thread ended.\n");
</ins><span class="cx">
</span><ins>+ ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING);
+
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2159,18 +2163,23 @@
</span><span class="cx"> int err;
</span><span class="cx">
</span><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
</span><ins>+
</ins><span class="cx"> ftdm_set_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING);
</span><del>- err=ftdm_thread_create_detached(ftdm_sangoma_boost_run, span);
</del><ins>+ err = ftdm_thread_create_detached(ftdm_sangoma_boost_run, span);
</ins><span class="cx"> if (err) {
</span><span class="cx"> ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING);
</span><span class="cx"> return err;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> // launch the events thread to handle HW DTMF and possibly
</span><span class="cx"> // other events in the future
</span><del>- err=ftdm_thread_create_detached(ftdm_sangoma_events_run, span);
</del><ins>+ ftdm_set_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING);
+ err = ftdm_thread_create_detached(ftdm_sangoma_events_run, span);
</ins><span class="cx"> if (err) {
</span><ins>+ ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING);
</ins><span class="cx"> ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return err;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2179,12 +2188,16 @@
</span><span class="cx"> int cnt = 50;
</span><span class="cx"> ftdm_status_t status = FTDM_SUCCESS;
</span><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
</span><ins>+
</ins><span class="cx"> if (sangoma_boost_data->sigmod) {
</span><span class="cx"> /* I think stopping the span before destroying the queue makes sense
</span><span class="cx"> otherwise may be boost events would still arrive when the queue is already destroyed! */
</span><span class="cx"> status = sangoma_boost_data->sigmod->stop_span(span);
</span><ins>+ if (status != FTDM_SUCCESS) {
+ ftdm_log(FTDM_LOG_CRIT, "Failed to stop span %s boost signaling\n", span->name);
+ return FTDM_FAIL;
+ }
</ins><span class="cx"> ftdm_queue_enqueue(sangoma_boost_data->boost_queue, NULL);
</span><del>- return status;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING) && cnt-- > 0) {
</span><span class="lines">@@ -2197,6 +2210,17 @@
</span><span class="cx"> return FTDM_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ cnt = 50;
+ while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING) && cnt-- > 0) {
+ ftdm_log(FTDM_LOG_DEBUG, "Waiting for boost events thread\n");
+ ftdm_sleep(100);
+ }
+
+ if (!cnt) {
+ ftdm_log(FTDM_LOG_CRIT, "it seems boost events thread in span %s may be stuck, we may segfault :-(\n", span->name);
+ return FTDM_FAIL;
+ }
+
</ins><span class="cx"> if (sangoma_boost_data->sigmod) {
</span><span class="cx"> ftdm_queue_destroy(&sangoma_boost_data->boost_queue);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>