Changeset 862

Timestamp:

01/19/08 12:09:55 (16 years ago)

Author:

ppalmers

Message:

fix xrun recovery and robustify

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (7 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (2 diffs)
• trunk/libffado/tests/test-ieee1394service.cpp (modified) (2 diffs)

trunk/libffado/config.h.in

@@ -54 +54 @@
-#define MAX_ISO_XMIT_BUFFER_FILL_PCT        50
-
-1
+0
-#define ISOHANDLER_USE_POLL                 0
-#define ISOHANDLER_FLUSH_BEFORE_ITERATE     0

trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

@@ -1640 +1640 @@
-bool StreamProcessor::waitForProduce(unsigned int nframes)
-{
-) wait ...\n", this
+, %s) wait ...\n", this, getTypeString()
-    struct timespec ts;
-    int result;
@@ -1662 +1662 @@
-        if (result == -1) {
-            if (errno == ETIMEDOUT) {
-) pthread_cond_timedwait() timed out\n", this
+, %s) pthread_cond_timedwait() timed out\n", this, getTypeString()
-                pthread_mutex_unlock(&m_activity_cond_lock);
-                return false;
-            } else {
-) pthread_cond_timedwait error\n", this
+, %s) pthread_cond_timedwait error\n", this, getTypeString()
-                pthread_mutex_unlock(&m_activity_cond_lock);
-                return false;
@@ -1686 +1686 @@
-bool StreamProcessor::waitForConsume(unsigned int nframes)
-{
-) wait ...\n", this
+, %s) wait ...\n", this, getTypeString()
-    struct timespec ts;
-    int result;
@@ -1705 +1705 @@
-    while(!canConsume(nframes)) {
-        result = pthread_cond_timedwait(&m_activity_cond, &m_activity_cond_lock, &ts);
-    
-        if (result == -1) {
-            if (errno == ETIMEDOUT) {
-) pthread_cond_timedwait() timed out\n", this
+, %s) pthread_cond_timedwait() timed out\n", this, getTypeString()
-                pthread_mutex_unlock(&m_activity_cond_lock);
-                return false;
-            } else {
-) pthread_cond_timedwait error\n", this
+, %s) pthread_cond_timedwait error\n", this, getTypeString()
-                pthread_mutex_unlock(&m_activity_cond_lock);
-                return false;
@@ -1719 +1718 @@
-    }
-    pthread_mutex_unlock(&m_activity_cond_lock);
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "(%p, %s) leave ...\n", this, getTypeString());
-    return true;
-}
@@ -1732 +1732 @@
-bool StreamProcessor::canProduce(unsigned int nframes)
-{
+    if(m_in_xrun) return true;
-    if(m_state == ePS_Running && m_next_state == ePS_Running) {
-        // check whether we already fullfil the criterion
@@ -1762 +1763 @@
-bool StreamProcessor::canConsume(unsigned int nframes)
-{
+    if(m_in_xrun) return true;
-    if(m_state == ePS_Running && m_next_state == ePS_Running) {
-        // check whether we already fullfil the criterion

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -711 +711 @@
-
-    while(period_not_ready) {
-Y_VER
+
-        bool result;
-        if(m_SyncSource->getType() == StreamProcessor::ePT_Receive) {
@@ -757 +757 @@
-        if(xrun_occurred) break;
-        // FIXME: make sure we also exit this loop when something else happens (e.g. signal, iso error)
+    }
+
+    if(xrun_occurred) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "exit due to xrun...\n");
-    }
-

trunk/libffado/tests/test-ieee1394service.cpp

@@ -50 +50 @@
-    #define THREAD_RT true
-    #define THREAD_PRIO 90
-0
+
-    
-using namespace Util;
@@ -56 +56 @@
-DECLARE_GLOBAL_DEBUG_MODULE;
-
-
+0
-int PORT_TO_USE = 0;
-