<!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][15587] </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=15587">15587</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-20 19:00:58 -0600 (Fri, 20 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix thread saftey issue in expiring media bugs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_ioc">freeswitch/trunk/src/switch_core_io.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_media_bugc">freeswitch/trunk/src/switch_core_media_bug.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (15586 => 15587)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2009-11-21 00:04:27 UTC (rev 15586)
+++ freeswitch/trunk/src/include/switch_core.h 2009-11-21 01:00:58 UTC (rev 15587)
</span><span class="lines">@@ -217,6 +217,7 @@
</span><span class="cx"> \return SWITCH_STATUS_SUCCESS if the operation was a success
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(_In_ switch_core_session_t *session, _Inout_ switch_media_bug_t **bug);
</span><ins>+SWITCH_DECLARE(uint32_t) switch_core_media_bug_prune(switch_core_session_t *session);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> \brief Remove media bug callback
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (15586 => 15587)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-11-21 00:04:27 UTC (rev 15586)
+++ freeswitch/trunk/src/include/switch_types.h 2009-11-21 01:00:58 UTC (rev 15587)
</span><span class="lines">@@ -1141,7 +1141,8 @@
</span><span class="cx"> SMBF_READ_PING = (1 << 4),
</span><span class="cx"> SMBF_STEREO = (1 << 5),
</span><span class="cx"> SMBF_ANSWER_REQ = (1 << 6),
</span><del>- SMBF_THREAD_LOCK = (1 << 7)
</del><ins>+ SMBF_THREAD_LOCK = (1 << 7),
+ SMBF_PRUNE = (1 << 8)
</ins><span class="cx"> } switch_media_bug_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_media_bug_flag_t;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_io.c (15586 => 15587)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_io.c 2009-11-21 00:04:27 UTC (rev 15586)
+++ freeswitch/trunk/src/switch_core_io.c 2009-11-21 01:00:58 UTC (rev 15587)
</span><span class="lines">@@ -330,13 +330,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (session->bugs && !switch_channel_test_flag(session->channel, CF_PAUSE_BUGS)) {
</span><del>- switch_media_bug_t *bp, *dp, *last = NULL;
</del><ins>+ switch_media_bug_t *bp;
</ins><span class="cx"> switch_bool_t ok = SWITCH_TRUE;
</span><span class="cx"> switch_thread_rwlock_rdlock(session->bug_rwlock);
</span><ins>+ int prune = 0;
+
</ins><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><span class="cx"> if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+ if (switch_test_flag(bp, SMBF_PRUNE)) {
+ prune++;
+ continue;
+ }
</ins><span class="cx">
</span><span class="cx"> if (bp->ready && switch_test_flag(bp, SMBF_READ_STREAM)) {
</span><span class="cx"> switch_mutex_lock(bp->read_mutex);
</span><span class="lines">@@ -358,28 +364,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (bp->stop_time && bp->stop_time <= switch_epoch_time_now(NULL)) {
- ok = SWITCH_FALSE;
</del><ins>+ if ((bp->stop_time && bp->stop_time <= switch_epoch_time_now(NULL)) || ok == SWITCH_FALSE) {
+ switch_set_flag(bp, SMBF_PRUNE);
+ prune++;
</ins><span class="cx"> }
</span><del>-
- if (ok == SWITCH_FALSE) {
- bp->ready = 0;
- if (last) {
- last->next = bp->next;
- } else {
- session->bugs = bp->next;
- }
- dp = bp;
- bp = last;
- switch_core_media_bug_close(&dp);
- if (!bp) {
- break;
- }
- continue;
- }
- last = bp;
</del><ins>+
+
</ins><span class="cx"> }
</span><span class="cx"> switch_thread_rwlock_unlock(session->bug_rwlock);
</span><ins>+ if (prune) {
+ switch_core_media_bug_prune(session);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (do_bugs) {
</span><span class="lines">@@ -496,14 +491,20 @@
</span><span class="cx"> switch_set_flag((*frame), SFF_CNG);
</span><span class="cx"> }
</span><span class="cx"> if (session->bugs && !switch_channel_test_flag(session->channel, CF_PAUSE_BUGS)) {
</span><del>- switch_media_bug_t *bp, *dp, *last = NULL;
</del><ins>+ switch_media_bug_t *bp;
</ins><span class="cx"> switch_bool_t ok = SWITCH_TRUE;
</span><ins>+ int prune = 0;
</ins><span class="cx"> switch_thread_rwlock_rdlock(session->bug_rwlock);
</span><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><span class="cx"> if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (switch_test_flag(bp, SMBF_PRUNE)) {
+ prune++;
+ continue;
+ }
+
</ins><span class="cx"> if (bp->ready && switch_test_flag(bp, SMBF_READ_PING)) {
</span><span class="cx"> switch_mutex_lock(bp->read_mutex);
</span><span class="cx"> if (bp->callback) {
</span><span class="lines">@@ -516,23 +517,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ok == SWITCH_FALSE) {
</span><del>- bp->ready = 0;
- if (last) {
- last->next = bp->next;
- } else {
- session->bugs = bp->next;
- }
- dp = bp;
- bp = last;
- switch_core_media_bug_close(&dp);
- if (!bp) {
- break;
- }
- continue;
</del><ins>+ switch_set_flag(bp, SMBF_PRUNE);
+ prune++;
</ins><span class="cx"> }
</span><del>- last = bp;
</del><span class="cx"> }
</span><span class="cx"> switch_thread_rwlock_unlock(session->bug_rwlock);
</span><ins>+ if (prune) {
+ switch_core_media_bug_prune(session);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -760,8 +752,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (session->bugs && !switch_channel_test_flag(session->channel, CF_PAUSE_BUGS)) {
</span><del>- switch_media_bug_t *bp, *dp, *last = NULL;
-
</del><ins>+ switch_media_bug_t *bp;
+ int prune = 0;
+
</ins><span class="cx"> switch_thread_rwlock_rdlock(session->bug_rwlock);
</span><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><span class="cx"> switch_bool_t ok = SWITCH_TRUE;
</span><span class="lines">@@ -773,6 +766,11 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (switch_test_flag(bp, SMBF_PRUNE)) {
+ prune++;
+ continue;
+ }
+
</ins><span class="cx"> if (switch_test_flag(bp, SMBF_WRITE_STREAM)) {
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(bp->write_mutex);
</span><span class="lines">@@ -800,23 +798,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (ok == SWITCH_FALSE) {
</span><del>- bp->ready = 0;
- if (last) {
- last->next = bp->next;
- } else {
- session->bugs = bp->next;
- }
- dp = bp;
- bp = last;
- switch_core_media_bug_close(&dp);
- if (!bp) {
- break;
- }
- continue;
</del><ins>+ switch_set_flag(bp, SMBF_PRUNE);
+ prune++;
</ins><span class="cx"> }
</span><del>- last = bp;
</del><span class="cx"> }
</span><span class="cx"> switch_thread_rwlock_unlock(session->bug_rwlock);
</span><ins>+ if (prune) {
+ switch_core_media_bug_prune(session);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (do_bugs) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_media_bugc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_media_bug.c (15586 => 15587)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_media_bug.c 2009-11-21 00:04:27 UTC (rev 15586)
+++ freeswitch/trunk/src/switch_core_media_bug.c 2009-11-21 01:00:58 UTC (rev 15587)
</span><span class="lines">@@ -437,6 +437,46 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(uint32_t) switch_core_media_bug_prune(switch_core_session_t *session)
+{
+ switch_media_bug_t *bp = NULL, *last = NULL;
+ switch_status_t status = SWITCH_STATUS_FALSE;
+ int ttl = 0;
+
+
+ top:
+
+ if (session->bugs) {
+ switch_thread_rwlock_wrlock(session->bug_rwlock);
+ for (bp = session->bugs; bp; bp = bp->next) {
+ if (switch_core_media_bug_test_flag(bp, SMBF_PRUNE)) {
+ if (last) {
+ last->next = bp->next;
+ } else {
+ session->bugs = bp->next;
+ }
+ break;
+ }
+
+ last = bp;
+ }
+ switch_thread_rwlock_unlock(session->bug_rwlock);
+ if (bp) {
+ status = switch_core_media_bug_close(&bp);
+ ttl++;
+ goto top;
+ }
+ }
+
+ if (!session->bugs && switch_core_codec_ready(&session->bug_codec)) {
+ switch_core_codec_destroy(&session->bug_codec);
+ memset(&session->bug_codec, 0, sizeof(session->bug_codec));
+ }
+
+ return ttl;
+}
+
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_callback(switch_core_session_t *session, switch_media_bug_callback_t callback)
</span><span class="cx"> {
</span><span class="cx"> switch_media_bug_t *cur = NULL, *bp = NULL, *last = NULL;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>