<!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][14633] </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=14633">14633</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-25 06:51:55 -0500 (Tue, 25 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: hupall works, hangup works, locking seems to works. There will be a way to push/pop a function that will be called on thread eit (die) to remove dangling locks? Maybe not needed, we don't kill threads. Heh. :-) </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliaxh">freeswitch/branches/gmaruzz/mod_celliax/celliax.h</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc">freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc">freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax.h (14632 => 14633)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-25 10:07:07 UTC (rev 14632)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-25 11:51:55 UTC (rev 14633)
</span><span class="lines">@@ -483,8 +483,10 @@
</span><span class="cx">
</span><span class="cx"> #define PUSHA_UNLOCKA(x) if(option_debug > 100) ERRORA("PUSHA_UNLOCKA: %p\n", SKYPIAX_P_LOG, (void *)x);
</span><span class="cx"> #define POPPA_UNLOCKA(x) if(option_debug > 100) ERRORA("POPPA_UNLOCKA: %p\n", SKYPIAX_P_LOG, (void *)x);
</span><del>-#define LOKKA(x) if(option_debug > 100) ERRORA("LOKKA: %p\n", SKYPIAX_P_LOG, (void *)x);
-#define UNLOCKA(x) if(option_debug > 100) ERRORA("UNLOCKA: %p\n", SKYPIAX_P_LOG, (void *)x);
</del><ins>+//#define LOKKA(x) if(option_debug > 100) ERRORA("LOKKA: %p\n", SKYPIAX_P_LOG, (void *)x);
+#define LOKKA(x) switch_mutex_lock(x);
+#define UNLOCKA(x) switch_mutex_unlock(x);
+//#define UNLOCKA(x) if(option_debug > 100) ERRORA("UNLOCKA: %p\n", SKYPIAX_P_LOG, (void *)x);
</ins><span class="cx">
</span><span class="cx"> #define celliax_queue_control(x, y) ERRORA("celliax_queue_control: %p, %d\n", SKYPIAX_P_LOG, (void *)x, y);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c (14632 => 14633)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-25 10:07:07 UTC (rev 14632)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-25 11:51:55 UTC (rev 14633)
</span><span class="lines">@@ -1869,8 +1869,8 @@
</span><span class="cx">
</span><span class="cx"> timeout.tv_sec = timeout_sec;
</span><span class="cx"> timeout.tv_usec = timeout_usec;
</span><del>- PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
- LOKKA(&tech_pvt->controldev_lock);
</del><ins>+ PUSHA_UNLOCKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
</ins><span class="cx">
</span><span class="cx"> while ((select_err = select(tech_pvt->controldevfd + 1, &read_fds, NULL, NULL, &timeout)) > 0) {
</span><span class="cx"> timeout.tv_sec = timeout_sec; //reset the timeout, linux modify it
</span><span class="lines">@@ -1884,7 +1884,7 @@
</span><span class="cx"> SKYPIAX_P_LOG, tech_pvt->controldevice_name);
</span><span class="cx"> tech_pvt->controldev_dead = 1;
</span><span class="cx"> close(tech_pvt->controldevfd);
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx"> if (tech_pvt->owner) {
</span><span class="cx"> tech_pvt->owner->hangupcause = SKYPIAX_CAUSE_FAILURE;
</span><span class="cx"> celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_HANGUP);
</span><span class="lines">@@ -2889,8 +2889,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
- POPPA_UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
+ POPPA_UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx"> if (select_err == -1) {
</span><span class="cx"> ERRORA("select returned -1 on %s, setting controldev_dead, error was: %s\n",
</span><span class="cx"> SKYPIAX_P_LOG, tech_pvt->controldevice_name, strerror(errno));
</span><span class="lines">@@ -3087,16 +3087,16 @@
</span><span class="cx"> if (option_debug > 1)
</span><span class="cx"> DEBUGA_SKYPE("celliax_serial_write_AT_noack: %s\n", SKYPIAX_P_LOG, data);
</span><span class="cx">
</span><del>- PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
- LOKKA(&tech_pvt->controldev_lock);
</del><ins>+ PUSHA_UNLOCKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
</ins><span class="cx"> if (celliax_serial_write_AT(tech_pvt, data) != strlen(data)) {
</span><span class="cx">
</span><span class="cx"> ERRORA("Error sending data... (%s)\n", SKYPIAX_P_LOG, strerror(errno));
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
- POPPA_UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
+ POPPA_UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -3105,19 +3105,19 @@
</span><span class="cx"> {
</span><span class="cx"> int at_result = AT_ERROR;
</span><span class="cx">
</span><del>- PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
- LOKKA(&tech_pvt->controldev_lock);
</del><ins>+ PUSHA_UNLOCKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
</ins><span class="cx"> if (option_debug > 1)
</span><span class="cx"> DEBUGA_SKYPE("sending: %s\n", SKYPIAX_P_LOG, data);
</span><span class="cx"> if (celliax_serial_write_AT(tech_pvt, data) != strlen(data)) {
</span><span class="cx"> ERRORA("Error sending data... (%s) \n", SKYPIAX_P_LOG, strerror(errno));
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> at_result = celliax_serial_read_AT(tech_pvt, 1, 500000, 2, NULL, 1); // 2.5 sec timeout
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
- POPPA_UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
+ POPPA_UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx">
</span><span class="cx"> return at_result;
</span><span class="cx">
</span><span class="lines">@@ -3127,19 +3127,19 @@
</span><span class="cx"> {
</span><span class="cx"> int at_result = AT_ERROR;
</span><span class="cx">
</span><del>- PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
- LOKKA(&tech_pvt->controldev_lock);
</del><ins>+ PUSHA_UNLOCKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
</ins><span class="cx"> if (option_debug > 1)
</span><span class="cx"> DEBUGA_SKYPE("sending: %s\n", SKYPIAX_P_LOG, data);
</span><span class="cx"> if (celliax_serial_write_AT_nocr(tech_pvt, data) != strlen(data)) {
</span><span class="cx"> ERRORA("Error sending data... (%s) \n", SKYPIAX_P_LOG, strerror(errno));
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> at_result = celliax_serial_read_AT(tech_pvt, 1, 500000, 20, NULL, 1); // 20.5 sec timeout
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
- POPPA_UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
+ POPPA_UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx">
</span><span class="cx"> return at_result;
</span><span class="cx">
</span><span class="lines">@@ -3151,19 +3151,19 @@
</span><span class="cx"> {
</span><span class="cx"> int at_result = AT_ERROR;
</span><span class="cx">
</span><del>- PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
- LOKKA(&tech_pvt->controldev_lock);
</del><ins>+ PUSHA_UNLOCKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
</ins><span class="cx"> if (option_debug > 1)
</span><span class="cx"> DEBUGA_SKYPE("sending: %s, expecting: %s\n", SKYPIAX_P_LOG, data, expected_string);
</span><span class="cx"> if (celliax_serial_write_AT(tech_pvt, data) != strlen(data)) {
</span><span class="cx"> ERRORA("Error sending data... (%s) \n", SKYPIAX_P_LOG, strerror(errno));
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> at_result = celliax_serial_read_AT(tech_pvt, 1, 500000, seconds, expected_string, expect_crlf); // 20.5 sec timeout, used for querying the SIM and sending SMSs
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
- POPPA_UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
+ POPPA_UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx">
</span><span class="cx"> return at_result;
</span><span class="cx">
</span><span class="lines">@@ -3174,14 +3174,14 @@
</span><span class="cx"> {
</span><span class="cx"> int at_result = AT_ERROR;
</span><span class="cx">
</span><del>- PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
- LOKKA(&tech_pvt->controldev_lock);
</del><ins>+ PUSHA_UNLOCKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
</ins><span class="cx"> if (option_debug > 1)
</span><span class="cx"> DEBUGA_SKYPE("expecting: %s\n", SKYPIAX_P_LOG, expected_string);
</span><span class="cx">
</span><span class="cx"> at_result = celliax_serial_read_AT(tech_pvt, 1, 500000, seconds, expected_string, expect_crlf); // 20.5 sec timeout, used for querying the SIM and sending SMSs
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
- POPPA_UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
+ POPPA_UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx">
</span><span class="cx"> return at_result;
</span><span class="cx">
</span><span class="lines">@@ -3529,11 +3529,11 @@
</span><span class="cx"> }
</span><span class="cx"> #ifndef ASTERISK_VERSION_1_4
</span><span class="cx"> /* subtract one to the usage count of Celliax-type channels */
</span><del>- LOKKA(&celliax_usecnt_lock);
</del><ins>+ LOKKA(celliax_usecnt_lock);
</ins><span class="cx"> celliax_usecnt--;
</span><span class="cx"> if (celliax_usecnt < 0)
</span><span class="cx"> ERRORA("Usecnt < 0???\n", SKYPIAX_P_LOG);
</span><del>- UNLOCKA(&celliax_usecnt_lock);
</del><ins>+ UNLOCKA(celliax_usecnt_lock);
</ins><span class="cx"> ast_update_use_count();
</span><span class="cx"> #else /* ASTERISK_VERSION_1_4 */
</span><span class="cx"> ast_module_unref(ast_module_info->self);
</span><span class="lines">@@ -3654,8 +3654,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
- LOKKA(&tech_pvt->controldev_lock);
</del><ins>+ PUSHA_UNLOCKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
</ins><span class="cx"> res = celliax_serial_write_AT_ack(tech_pvt, "AT");
</span><span class="cx"> if (res) {
</span><span class="cx"> ERRORA("AT was not acknowledged, continuing but maybe there is a problem\n",
</span><span class="lines">@@ -3791,8 +3791,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UNLOCKA(&tech_pvt->controldev_lock);
- POPPA_UNLOCKA(&tech_pvt->controldev_lock);
</del><ins>+ UNLOCKA(tech_pvt->controldev_lock);
+ POPPA_UNLOCKA(tech_pvt->controldev_lock);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14632 => 14633)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-25 10:07:07 UTC (rev 14632)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-25 11:51:55 UTC (rev 14633)
</span><span class="lines">@@ -1252,6 +1252,9 @@
</span><span class="cx"> switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].controldevice_name, controldevice_name);
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].controldevice_speed = controldevice_speed;
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].controldevprotocol = controldevprotocol;
</span><ins>+
+
+ switch_mutex_init(&globals.SKYPIAX_INTERFACES[interface_id].controldev_lock, SWITCH_MUTEX_NESTED, celliax_module_pool);
</ins><span class="cx"> /*********************/
</span><span class="cx"> #ifdef NOTDEF
</span><span class="cx"> .interface_state = SKYPIAX_STATE_DOWN;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>