<!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][16998] </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=16998">16998</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2010-03-15 16:25:42 -0500 (Mon, 15 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Comments OCD</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_curlmod_xml_curlc">freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodxml_intmod_xml_curlmod_xml_curlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (16997 => 16998)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c 2010-03-15 21:17:53 UTC (rev 16997)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c 2010-03-15 21:25:42 UTC (rev 16998)
</span><span class="lines">@@ -342,14 +342,14 @@
</span><span class="cx"> xml_binding_t **second_order = NULL;
</span><span class="cx"> switch_xml_t result = NULL;
</span><span class="cx">
</span><del>- // Count how many elements we have
</del><ins>+ /* Count how many elements we have */
</ins><span class="cx"> for( ; binding != NULL; binding = binding->next) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found [%s]\n", binding->url);
</span><span class="cx"> count++;
</span><span class="cx"> }
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XML_CURL Fetch on %d bindings\n", count);
</span><span class="cx">
</span><del>- // Make a local copy of the bindings
</del><ins>+ /* Make a local copy of the bindings */
</ins><span class="cx"> bindings_copy = malloc(count*sizeof(xml_binding_t));
</span><span class="cx"> tmp = bindings_copy;
</span><span class="cx"> binding = root;
</span><span class="lines">@@ -360,16 +360,16 @@
</span><span class="cx"> pos++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // And two ordering arrays
</del><ins>+ /* And two ordering arrays */
</ins><span class="cx"> first_order = malloc(count*sizeof(xml_binding_t*));
</span><span class="cx"> memset(first_order, 0, count*sizeof(xml_binding_t*));
</span><span class="cx"> second_order = malloc(count*sizeof(xml_binding_t*));
</span><span class="cx"> memset(second_order, 0, count*sizeof(xml_binding_t*));
</span><span class="cx">
</span><del>- // Update root to point to local copy of binding data
</del><ins>+ /* Update root to point to local copy of binding data */
</ins><span class="cx"> root = bindings_copy;
</span><span class="cx">
</span><del>- // Put all weight=0 at beginning of first ordering array
</del><ins>+ /* Put all weight=0 at beginning of first ordering array */
</ins><span class="cx"> binding = root; pos = 0;
</span><span class="cx"> for(int i = 0; i < count; i++) {
</span><span class="cx"> binding = &bindings_copy[i];
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Then dump everything else into the first ordering array
</del><ins>+ /* Then dump everything else into the first ordering array */
</ins><span class="cx"> binding = root;
</span><span class="cx"> for(int i = 0; i < count; i++) {
</span><span class="cx"> binding = &bindings_copy[i];
</span><span class="lines">@@ -393,10 +393,10 @@
</span><span class="cx">
</span><span class="cx"> srand((unsigned)((unsigned)(intptr_t)switch_thread_self() + switch_micro_time_now()));
</span><span class="cx">
</span><del>- // We need to pick every element in the array, so loop once for every one of them
</del><ins>+ /* We need to pick every element in the array, so loop once for every one of them */
</ins><span class="cx"> pos = 0;
</span><span class="cx"> for(int i = 0; i < count; i++) {
</span><del>- // Calculate the total remaining unchosen weight
</del><ins>+ /* Calculate the total remaining unchosen weight */
</ins><span class="cx"> total_weight = 0; running_weight = 0;
</span><span class="cx"> for(int b = 0; b < count; b++) {
</span><span class="cx"> binding = &bindings_copy[b];
</span><span class="lines">@@ -404,18 +404,18 @@
</span><span class="cx"> }
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remaining total weight [%d]\n", total_weight);
</span><span class="cx">
</span><del>- // Pick a random number between [0, total_weight]
- // Note: Don't use rand() % M as it is not as random as this more complex
- // method which achieves the same intent with more random results
</del><ins>+ /* Pick a random number between [0, total_weight]
+ * Note: Don't use rand() % M as it is not as random as this more complex
+ * method which achieves the same intent with more random results */
</ins><span class="cx"> rand_weight = (int)( ((double)rand()) / (((double)(RAND_MAX) + (double)(1)) / ((double)total_weight + (double)(1))) );
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Random weight [%d]\n", rand_weight);
</span><span class="cx">
</span><del>- // Then grab the first unchosen element whose running_weight >= rand_weight
- // and move it into our 'picked' list
</del><ins>+ /* Then grab the first unchosen element whose running_weight >= rand_weight
+ and move it into our 'picked' list */
</ins><span class="cx"> binding = root;
</span><span class="cx"> for(int b = 0; b < count; b++) {
</span><span class="cx"> binding = &bindings_copy[b];
</span><del>- if(binding->chosen) continue; // skip already picked elements
</del><ins>+ if(binding->chosen) continue; /* skip already picked elements */
</ins><span class="cx">
</span><span class="cx"> running_weight += binding->weight;
</span><span class="cx"> if(running_weight >= rand_weight) {
</span><span class="lines">@@ -466,8 +466,8 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Only 32768 bindings allowed or weight sum could exceed signed int max
- // value breaking load balancing algorithm
</del><ins>+ /* Only 32768 bindings allowed or weight sum could exceed signed int max
+ * value breaking load balancing algorithm */
</ins><span class="cx"> for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag && x < 32768; binding_tag = binding_tag->next) {
</span><span class="cx"> char *bname = (char *) switch_xml_attr_soft(binding_tag, "name");
</span><span class="cx"> char *url = NULL;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>