<!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][15573] </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=15573">15573</a></dd>
<dt>Author</dt> <dd>crienzo</dd>
<dt>Date</dt> <dd>2009-11-20 11:32:47 -0600 (Fri, 20 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>switch_thread_cond_timedwait corrections for mod_unimrcp</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc">freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (15572 => 15573)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-11-20 17:29:59 UTC (rev 15572)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-11-20 17:32:47 UTC (rev 15573)
</span><span class="lines">@@ -666,19 +666,18 @@
</span><span class="cx">
</span><span class="cx"> /* wait for data, if allowed */
</span><span class="cx"> if (block) {
</span><del>- if (switch_buffer_inuse(queue->buffer) < requested) {
</del><ins>+ while (switch_buffer_inuse(queue->buffer) < requested) {
</ins><span class="cx"> queue->waiting = requested;
</span><del>- switch_thread_cond_timedwait(queue->cond, queue->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
- if (switch_buffer_inuse(queue->buffer) < requested) {
- requested = switch_buffer_inuse(queue->buffer);
</del><ins>+ if (switch_thread_cond_timedwait(queue->cond, queue->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> queue->waiting = 0;
</span><del>- } else {
- if (switch_buffer_inuse(queue->buffer) < requested) {
- requested = switch_buffer_inuse(queue->buffer);
- }
</del><span class="cx"> }
</span><ins>+
+ if (switch_buffer_inuse(queue->buffer) < requested) {
+ requested = switch_buffer_inuse(queue->buffer);
+ }
</ins><span class="cx"> if (requested == 0) {
</span><span class="cx"> *data_len = 0;
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -818,7 +817,11 @@
</span><span class="cx"> switch_mutex_lock(schannel->mutex);
</span><span class="cx"> if (schannel->state != SPEECH_CHANNEL_CLOSED) {
</span><span class="cx"> mrcp_application_channel_remove(schannel->unimrcp_session, schannel->unimrcp_channel);
</span><del>- switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
</del><ins>+ while(schannel->state != SPEECH_CHANNEL_CLOSED) {
+ if (switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
+ }
+ }
</ins><span class="cx"> audio_queue_destroy(schannel->audio_queue);
</span><span class="cx"> if (schannel->state != SPEECH_CHANNEL_CLOSED) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to destroy channel. Continuing\n", schannel->name);
</span><span class="lines">@@ -947,7 +950,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* wait for channel to be ready */
</span><del>- switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
</del><ins>+ while (schannel->state == SPEECH_CHANNEL_CLOSED) {
+ if (switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
+ }
+ }
</ins><span class="cx"> if (schannel->state == SPEECH_CHANNEL_READY) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) channel is ready\n", schannel->name);
</span><span class="cx"> }
</span><span class="lines">@@ -957,7 +964,11 @@
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> } else if (schannel->state == SPEECH_CHANNEL_ERROR) {
</span><span class="cx"> /* Wait for session to be cleaned up */
</span><del>- switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
</del><ins>+ while(schannel->state == SPEECH_CHANNEL_ERROR) {
+ if (switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
+ }
+ }
</ins><span class="cx"> if (schannel->state != SPEECH_CHANNEL_CLOSED) {
</span><span class="cx"> /* major issue... can't retry */
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -1033,7 +1044,11 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> /* wait for IN PROGRESS */
</span><del>- switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
</del><ins>+ while (schannel->state == SPEECH_CHANNEL_READY) {
+ if (switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
+ }
+ }
</ins><span class="cx"> if (schannel->state != SPEECH_CHANNEL_PROCESSING) {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="lines">@@ -1271,7 +1286,11 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> mrcp_application_message_send(schannel->unimrcp_session, schannel->unimrcp_channel, mrcp_message);
</span><del>- switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
</del><ins>+ while (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+ if (switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Timed out waiting for session to close. Continuing.\n", schannel->name);
</span><span class="lines">@@ -1562,8 +1581,6 @@
</span><span class="cx"> status = SWITCH_STATUS_BREAK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) rate = %d, native_rate = %d, samplerate = %d\n", schannel->name, sh->rate, sh->native_rate, sh->samplerate);
-
</del><span class="cx"> /* report negotiated sample rate back to FreeSWITCH */
</span><span class="cx"> sh->native_rate = schannel->rate;
</span><span class="cx">
</span><span class="lines">@@ -2072,7 +2089,11 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> /* wait for IN PROGRESS */
</span><del>- switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
</del><ins>+ while (schannel->state == SPEECH_CHANNEL_READY) {
+ if (switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
+ }
+ }
</ins><span class="cx"> if (schannel->state != SPEECH_CHANNEL_PROCESSING) {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="lines">@@ -2145,7 +2166,11 @@
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>- switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
</del><ins>+ while (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+ if (switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC) == SWITCH_STATUS_TIMEOUT) {
+ break;
+ }
+ }
</ins><span class="cx"> if (schannel->state != SPEECH_CHANNEL_READY) {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>