<!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][17209] </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=17209">17209</a></dd>
<dt>Author</dt> <dd>anthony.minessale</dd>
<dt>Date</dt> <dd>2010-04-02 14:45:36 -0500 (Fri, 02 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-583">FSCORE-583</a></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_pcmc">freeswitch/trunk/src/switch_pcm.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 (17208 => 17209)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2010-04-02 18:52:35 UTC (rev 17208)
+++ freeswitch/trunk/src/switch_core_session.c 2010-04-02 19:45:36 UTC (rev 17209)
</span><span class="lines">@@ -128,17 +128,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+struct str_node {
+ char *str;
+ struct str_node *next;
+};
+
</ins><span class="cx"> SWITCH_DECLARE(void) switch_core_session_hupall_matching_var(const char *var_name, const char *var_val, switch_call_cause_t cause)
</span><span class="cx"> {
</span><span class="cx"> switch_hash_index_t *hi;
</span><span class="cx"> void *val;
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><del>- switch_queue_t *queue;
- void *pop;
</del><ins>+ struct str_node *head = NULL, *np;
</ins><span class="cx">
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><del>- switch_queue_create(&queue, 250000, pool);
</del><span class="cx">
</span><span class="cx"> if (!var_val)
</span><span class="cx"> return;
</span><span class="lines">@@ -152,7 +155,10 @@
</span><span class="cx"> if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (switch_channel_up(session->channel) &&
</span><span class="cx"> (this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) {
</span><del>- switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str));
</del><ins>+ np = switch_core_alloc(pool, sizeof(*np));
+ np->str = switch_core_strdup(pool, session->uuid_str);
+ np->next = head;
+ head = np;
</ins><span class="cx"> }
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="lines">@@ -160,10 +166,8 @@
</span><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(runtime.session_hash_mutex);
</span><span class="cx">
</span><del>- while (switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
- char *uuid = (char *) pop;
-
- if ((session = switch_core_session_locate(uuid))) {
</del><ins>+ for(np = head; np; np = np->next) {
+ if ((session = switch_core_session_locate(np->str))) {
</ins><span class="cx"> switch_channel_hangup(session->channel, cause);
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="lines">@@ -179,12 +183,10 @@
</span><span class="cx"> void *val;
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><del>- switch_queue_t *queue;
- void *pop;
-
</del><ins>+ struct str_node *head = NULL, *np;
+
</ins><span class="cx"> switch_core_new_memory_pool(&pool);
</span><del>- switch_queue_create(&queue, 250000, pool);
-
</del><ins>+
</ins><span class="cx"> switch_mutex_lock(runtime.session_hash_mutex);
</span><span class="cx"> for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) {
</span><span class="cx"> switch_hash_this(hi, NULL, NULL, &val);
</span><span class="lines">@@ -192,7 +194,10 @@
</span><span class="cx"> session = (switch_core_session_t *) val;
</span><span class="cx"> if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (session->endpoint_interface == endpoint_interface) {
</span><del>- switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str));
</del><ins>+ np = switch_core_alloc(pool, sizeof(*np));
+ np->str = switch_core_strdup(pool, session->uuid_str);
+ np->next = head;
+ head = np;
</ins><span class="cx"> }
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="lines">@@ -200,10 +205,8 @@
</span><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(runtime.session_hash_mutex);
</span><span class="cx">
</span><del>- while (switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
- char *uuid = (char *) pop;
-
- if ((session = switch_core_session_locate(uuid))) {
</del><ins>+ for(np = head; np; np = np->next) {
+ if ((session = switch_core_session_locate(np->str))) {
</ins><span class="cx"> switch_channel_hangup(session->channel, cause);
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="lines">@@ -219,29 +222,29 @@
</span><span class="cx"> void *val;
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><del>- switch_queue_t *queue;
- void *pop;
</del><ins>+ struct str_node *head = NULL, *np;
</ins><span class="cx">
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><del>- switch_queue_create(&queue, 250000, pool);
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> switch_mutex_lock(runtime.session_hash_mutex);
</span><span class="cx"> for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) {
</span><span class="cx"> switch_hash_this(hi, NULL, NULL, &val);
</span><span class="cx"> if (val) {
</span><span class="cx"> session = (switch_core_session_t *) val;
</span><span class="cx"> if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str));
</del><ins>+ np = switch_core_alloc(pool, sizeof(*np));
+ np->str = switch_core_strdup(pool, session->uuid_str);
+ np->next = head;
+ head = np;
</ins><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(runtime.session_hash_mutex);
</span><span class="cx">
</span><del>- while (switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
- char *uuid = (char *) pop;
-
- if ((session = switch_core_session_locate(uuid))) {
</del><ins>+ for(np = head; np; np = np->next) {
+ if ((session = switch_core_session_locate(np->str))) {
</ins><span class="cx"> switch_channel_hangup(session->channel, cause);
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_pcmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_pcm.c (17208 => 17209)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_pcm.c 2010-04-02 18:52:35 UTC (rev 17208)
+++ freeswitch/trunk/src/switch_pcm.c 2010-04-02 19:45:36 UTC (rev 17209)
</span><span class="lines">@@ -633,6 +633,7 @@
</span><span class="cx"> mod_g711_load(module_interface, pool);
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><ins>+ //return SWITCH_STATUS_NOUNLOAD;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(core_pcm_shutdown)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>