<!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][14437] </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=14437">14437</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-07-31 02:17:08 -0500 (Fri, 31 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: reviewed locking of globals, added lock on outbound interface selection and call, revamped 'RR' IDLE interface selection</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (14436 => 14437)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-07-31 00:07:43 UTC (rev 14436)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-07-31 07:17:08 UTC (rev 14437)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- while (x) { //FIXME 2 seconds?
</del><ins>+ while (x) {
</ins><span class="cx"> x--;
</span><span class="cx"> switch_yield(20000);
</span><span class="cx"> }
</span><span class="lines">@@ -773,6 +773,7 @@
</span><span class="cx"> slash = strrchr(interface_name, '/');
</span><span class="cx"> *slash = '\0';
</span><span class="cx">
</span><ins>+ switch_mutex_lock(globals.mutex);
</ins><span class="cx"> if (strncmp("ANY", interface_name, strlen(interface_name)) == 0) {
</span><span class="cx"> /* we've been asked for the "ANY" interface, let's find the first idle interface */
</span><span class="cx"> DEBUGA_SKYPE("Finding one available skype interface\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -798,6 +799,7 @@
</span><span class="cx"> SKYPIAX_P_LOG, i, globals.SKYPIAX_INTERFACES[i].name,
</span><span class="cx"> globals.SKYPIAX_INTERFACES[i].session_uuid_str);
</span><span class="cx"> switch_core_session_destroy(new_session);
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> return SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -820,6 +822,7 @@
</span><span class="cx"> ERRORA("Doh! no matching interface for |||%s|||?\n", SKYPIAX_P_LOG,
</span><span class="cx"> interface_name);
</span><span class="cx"> switch_core_session_destroy(new_session);
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -843,6 +846,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("Doh! no caller profile\n", SKYPIAX_P_LOG);
</span><span class="cx"> switch_core_session_destroy(new_session);
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -860,6 +864,7 @@
</span><span class="cx"> switch_channel_set_flag(channel, CF_OUTBOUND);
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
</span><span class="cx"> switch_channel_set_state(channel, CS_INIT);
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> return SWITCH_CAUSE_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -932,6 +937,7 @@
</span><span class="cx"> return SWITCH_STATUS_TERM;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_mutex_lock(globals.mutex);
</ins><span class="cx"> if ((global_settings = switch_xml_child(cfg, "global_settings"))) {
</span><span class="cx"> for (param = switch_xml_child(global_settings, "param"); param; param = param->next) {
</span><span class="cx"> char *var = (char *) switch_xml_attr_soft(param, "name");
</span><span class="lines">@@ -1225,6 +1231,7 @@
</span><span class="cx"> ("Failed to connect to a SKYPE API for interface_id=%d, no SKYPE client running, please (re)start Skype client. Skypiax exiting\n",
</span><span class="cx"> SKYPIAX_P_LOG, interface_id);
</span><span class="cx"> running = 0;
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> switch_xml_free(xml);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -1249,6 +1256,7 @@
</span><span class="cx"> interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user,
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].skype_user);
</span><span class="cx"> running = 0;
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> switch_xml_free(xml);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -1286,6 +1294,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> switch_xml_free(xml);
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1632,19 +1641,21 @@
</span><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> int i;
</span><del>- /* int num_interfaces = SKYPIAX_MAX_INTERFACES; */
- int num_interfaces = globals.real_interfaces;
</del><ins>+ //int num_interfaces = SKYPIAX_MAX_INTERFACES;
+ //int num_interfaces = globals.real_interfaces;
</ins><span class="cx">
</span><span class="cx"> switch_mutex_lock(globals.mutex);
</span><span class="cx">
</span><span class="cx"> /* Fact is the real interface start from 1 */
</span><del>- if (globals.next_interface == 0) globals.next_interface = 1;
</del><ins>+ //XXX no, is just a convention, but you can have it start from 0. I do not, for aestetic reasons :-)
+ //if (globals.next_interface == 0) globals.next_interface = 1;
</ins><span class="cx">
</span><del>- for (i = 0; i < num_interfaces; i++) {
</del><ins>+ for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) {
</ins><span class="cx"> int interface_id;
</span><span class="cx">
</span><del>- interface_id = globals.next_interface + i;
- interface_id = interface_id < num_interfaces ? interface_id : interface_id - num_interfaces + 1;
</del><ins>+ interface_id = globals.next_interface;
+ //interface_id = interface_id < SKYPIAX_MAX_INTERFACES ? interface_id : interface_id - SKYPIAX_MAX_INTERFACES + 1;
+ globals.next_interface = interface_id + 1 < SKYPIAX_MAX_INTERFACES ? interface_id + 1 : 0;
</ins><span class="cx">
</span><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[interface_id].name)) {
</span><span class="cx"> int skype_state = 0;
</span><span class="lines">@@ -1655,15 +1666,15 @@
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].name, skype_state);
</span><span class="cx"> if (SKYPIAX_STATE_DOWN == skype_state || 0 == skype_state) {
</span><span class="cx"> /*set to Dialing state to avoid other thread fint it, don't know if it is safe */
</span><del>- tech_pvt->interface_state = SKYPIAX_STATE_DIALING ;
</del><ins>+ //XXX no, it's not safe
+ //tech_pvt->interface_state = SKYPIAX_STATE_DIALING ;
</ins><span class="cx">
</span><del>- globals.next_interface = interface_id + 1 < num_interfaces ? interface_id + 1 : 1;
</del><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return tech_pvt;
</span><span class="cx"> }
</span><del>- } else {
- DEBUGA_SKYPE("Skype interface: %d blank!! A hole here means we cannot hunt the last interface.\n", SKYPIAX_P_LOG, interface_id);
- }
</del><ins>+ }// else {
+ //DEBUGA_SKYPE("Skype interface: %d blank!! A hole here means we cannot hunt the last interface.\n", SKYPIAX_P_LOG, interface_id);
+ //}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (14436 => 14437)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-07-31 00:07:43 UTC (rev 14436)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-07-31 07:17:08 UTC (rev 14437)
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> {
</span><span class="cx"> char msg_to_skype[1024];
</span><span class="cx">
</span><del>- skypiax_sleep(5000);
</del><ins>+ //skypiax_sleep(5000);
</ins><span class="cx"> DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest);
</span><span class="cx"> //skypiax_signaling_write(tech_pvt, "SET AGC OFF");
</span><span class="cx"> //skypiax_sleep(10000);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>