<!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][17254] </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=17254">17254</a></dd>
<dt>Author</dt> <dd>math.parent</dd>
<dt>Date</dt> <dd>2010-04-08 15:38:24 -0500 (Thu, 08 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: solve deadlocks and more
- Solve deadlock:
+ associate all skinny_profile_find_session with the corresponding
switch_core_session_rwunlock
+ lock the newly created session in skinny_create_ingoing_session
+ enhance rwlocks debugging
- Shared lines:
+ Inform shared lines on answering
+ Answering line has info after other shared lines</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (17253 => 17254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-08 19:49:49 UTC (rev 17253)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-08 20:38:24 UTC (rev 17254)
</span><span class="lines">@@ -235,14 +235,22 @@
</span><span class="cx"> return helper.channel_uuid;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifdef SWITCH_DEBUG_RWLOCKS
+switch_core_session_t * skinny_profile_perform_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id, const char *file, const char *func, int line)
+#else
</ins><span class="cx"> switch_core_session_t * skinny_profile_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id)
</span><ins>+#endif
</ins><span class="cx"> {
</span><span class="cx"> char *uuid;
</span><span class="cx"> switch_core_session_t *result = NULL;
</span><span class="cx"> uuid = skinny_profile_find_session_uuid(profile, listener, line_instance_p, call_id);
</span><span class="cx">
</span><span class="cx"> if(!zstr(uuid)) {
</span><ins>+#ifdef SWITCH_DEBUG_RWLOCKS
+ result = switch_core_session_perform_locate(uuid, file, func, line);
+#else
</ins><span class="cx"> result = switch_core_session_locate(uuid);
</span><ins>+#endif
</ins><span class="cx"> if(!result) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</span><span class="cx"> "Unable to find session %s on %s:%d, line %d\n",
</span><span class="lines">@@ -650,7 +658,6 @@
</span><span class="cx"> /* TODO: DefineTimeDate */
</span><span class="cx"> send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
</span><span class="cx"> send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, call_id);
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h (17253 => 17254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-04-08 19:49:49 UTC (rev 17253)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-04-08 20:38:24 UTC (rev 17254)
</span><span class="lines">@@ -189,7 +189,12 @@
</span><span class="cx"> switch_status_t skinny_profile_find_listener_by_device_name(skinny_profile_t *profile, const char *device_name, listener_t **listener);
</span><span class="cx"> switch_status_t skinny_profile_find_listener_by_device_name_and_instance(skinny_profile_t *profile, const char *device_name, uint32_t device_instance, listener_t **listener);
</span><span class="cx"> char * skinny_profile_find_session_uuid(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id);
</span><ins>+#ifdef SWITCH_DEBUG_RWLOCKS
+switch_core_session_t * skinny_profile_perform_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id, const char *file, const char *func, int line);
+#define skinny_profile_find_session(profile, listener, line_instance_p, call_id) skinny_profile_perform_find_session(profile, listener, line_instance_p, call_id, __FILE__, __SWITCH_FUNC__, __LINE__)
+#else
</ins><span class="cx"> switch_core_session_t * skinny_profile_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id);
</span><ins>+#endif
</ins><span class="cx"> switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream);
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (17253 => 17254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-08 19:49:49 UTC (rev 17253)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-08 20:38:24 UTC (rev 17254)
</span><span class="lines">@@ -446,13 +446,13 @@
</span><span class="cx">
</span><span class="cx"> line_instance = *line_instance_p;
</span><span class="cx"> if((nsession = skinny_profile_find_session(listener->profile, listener, line_instance_p, 0))) {
</span><del>- switch_core_session_rwunlock(nsession);
</del><span class="cx"> if(skinny_line_get_state(listener, *line_instance_p, 0) == SKINNY_OFF_HOOK) {
</span><span class="cx"> /* Reuse existing session */
</span><span class="cx"> *session = nsession;
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> skinny_session_hold_line(nsession, listener, *line_instance_p);
</span><ins>+ switch_core_session_rwunlock(nsession);
</ins><span class="cx"> }
</span><span class="cx"> *line_instance_p = line_instance;
</span><span class="cx"> if(*line_instance_p == 0) {
</span><span class="lines">@@ -494,7 +494,11 @@
</span><span class="cx"> "Error Creating Session thread\n");
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><del>-
</del><ins>+ if (switch_core_session_read_lock(nsession) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(nsession), SWITCH_LOG_CRIT,
+ "Error Locking Session\n");
+ goto error;
+ }
</ins><span class="cx"> if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(nsession),
</span><span class="cx"> NULL, listener->profile->dialplan,
</span><span class="cx"> button->shortname, button->name,
</span><span class="lines">@@ -579,8 +583,6 @@
</span><span class="cx"> skinny_session_start_media(session, listener, line_instance);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_core_session_rwunlock(session);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -603,8 +605,6 @@
</span><span class="cx"> line_instance, tech_pvt->call_id);
</span><span class="cx"> skinny_send_call_info(session, listener, line_instance);
</span><span class="cx">
</span><del>- switch_core_session_rwunlock(session);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -643,16 +643,14 @@
</span><span class="cx"> if(!strcmp(device_name, helper->listener->device_name)
</span><span class="cx"> && (device_instance == helper->listener->device_instance)
</span><span class="cx"> && (line_instance == helper->line_instance)) {/* the answering line */
</span><del>-
-
</del><ins>+ /* nothing */
+ } else {
+ send_define_current_time_date(listener);
+ send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_ON);
+ skinny_line_set_state(listener, line_instance, helper->tech_pvt->call_id, SKINNY_IN_USE_REMOTELY);
+ send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, 10, 0x0002);
+ send_display_prompt_status(listener, 0, "\200\037", line_instance, helper->tech_pvt->call_id);
</ins><span class="cx"> send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
</span><del>- send_set_speaker_mode(listener, SKINNY_SPEAKER_ON);
- send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_ON);
- skinny_line_set_state(listener, line_instance, helper->tech_pvt->call_id, SKINNY_OFF_HOOK);
- /* send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, SKINNY_KEY_SET_OFF_HOOK, 0xffff); */
- /* display_prompt_status(listener, 0, "\200\000",
- line_instance, tech_pvt->call_id); */
- send_activate_call_plane(listener, line_instance);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="lines">@@ -671,6 +669,12 @@
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx">
</span><ins>+ send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
+ send_set_speaker_mode(listener, SKINNY_SPEAKER_ON);
+ send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_ON);
+ skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_OFF_HOOK);
+ send_activate_call_plane(listener, line_instance);
+
</ins><span class="cx"> helper.tech_pvt = tech_pvt;
</span><span class="cx"> helper.listener = listener;
</span><span class="cx"> helper.line_instance = line_instance;
</span><span class="lines">@@ -679,8 +683,6 @@
</span><span class="cx">
</span><span class="cx"> skinny_session_start_media(session, listener, line_instance);
</span><span class="cx">
</span><del>- switch_core_session_rwunlock(session);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -717,8 +719,6 @@
</span><span class="cx"> tech_pvt->call_id);
</span><span class="cx"> skinny_send_call_info(session, listener, line_instance);
</span><span class="cx">
</span><del>- switch_core_session_rwunlock(session);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -739,8 +739,6 @@
</span><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><span class="cx">
</span><del>- switch_core_session_rwunlock(session);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2002,6 +2000,11 @@
</span><span class="cx">
</span><span class="cx"> skinny_session_process_dest(session, listener, line_instance, NULL, '\0', 0);
</span><span class="cx"> }
</span><ins>+
+ if(session) {
+ switch_core_session_rwunlock(session);
+ }
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2037,6 +2040,11 @@
</span><span class="cx"> default:
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown Stimulus Type Received [%d]\n", request->data.stimulus.instance_type);
</span><span class="cx"> }
</span><ins>+
+ if(session) {
+ switch_core_session_rwunlock(session);
+ }
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2118,9 +2126,13 @@
</span><span class="cx"> }
</span><span class="cx"> switch_channel_mark_answered(channel);
</span><span class="cx">
</span><ins>+ }
+end:
+
+ if(session) {
</ins><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><del>-end:
</del><ins>+
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2174,6 +2186,10 @@
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if(session) {
+ switch_core_session_rwunlock(session);
+ }
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2195,9 +2211,12 @@
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ if(session) {
</ins><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>