Changeset 1262

Timestamp:

06/21/08 04:24:17 (13 years ago)

Author:

ppalmers

Message:

fix small bug in calculation of semaphore timeout: ensuring that nsec < 1 sec should be done on the resulting timespec. Made SPM activity timeout dependent on the period size, since we can expect that there is activity at least once every period.

Files:

• branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/libstreaming/StreamProcessorManager.h (modified) (1 diff)

branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp

@@ -320 +320 @@
-    struct timespec ts;
-    int result;
+    long long int timeout_nsec = ISOHANDLERMANAGER_ISO_TASK_WAIT_TIMEOUT_USECS * 1000LL;
-
-    if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
@@ -325 +326 @@
-        return eAR_Error;
-    }
-
-
-
-
-
-
-
-
-
+
-    ts.tv_nsec += timeout_nsec;
-
+
+
+
+
-
-    result = sem_timedwait(&m_activity_semaphore, &ts);
@@ -350 +346 @@
-                        this, result);
-            return eAR_Interrupted;
+        } else if (errno == EINVAL) {
+            debugError("(%p) sem_timedwait error (result=%d errno=EINVAL)\n", 
+                        this, result);
+            debugError("(%p) timeout_nsec=%lld ts.sec=%d ts.nsec=%lld\n", 
+                       this, timeout_nsec, ts.tv_sec, ts.tv_nsec);
+            return eAR_Error;
-        } else {
-            debugError("(%p) sem_timedwait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-sec=%d timeout_
-sec, timeout_
+
+
-            return eAR_Error;
-        }

branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp

@@ -123 +123 @@
-    int result;
-
-    if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
-        debugError("clock_gettime failed\n");
-        return eAR_Error;
-    }
-    long long int timeout_nsec=0;
-    int timeout_sec = 0;
-    if (m_activity_wait_timeout_usec >= 0) {
-        timeout_nsec = m_activity_wait_timeout_usec * 1000LL;
-
-while(timeout_nsec >= 1000000000LL
-timeout_sec += 1
-timeout_nsec -= 1000000000LL
+
+if (clock_gettime(CLOCK_REALTIME, &ts) == -1
+debugError("clock_gettime failed\n")
+return eAR_Error
-        }
-        ts.tv_nsec += timeout_nsec;
-
+
+
+
+
-    }
-
@@ -157 +155 @@
-                        this, result);
-            return eAR_Interrupted;
+        } else if (errno == EINVAL) {
+            debugError("(%p) sem_[timed]wait error (result=%d errno=EINVAL)\n", 
+                        this, result);
+            debugError("(%p) timeout_nsec=%lld ts.sec=%d ts.nsec=%lld\n", 
+                       this, timeout_nsec, ts.tv_sec, ts.tv_nsec);
+            return eAR_Error;
-        } else {
-            debugError("(%p) sem_[timed]wait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-sec=%d timeout_
-sec, timeout_
+
+
-            return eAR_Error;
-        }
@@ -318 +322 @@
-        return false;
-    }
+
+    // set the activity timeout value to two periods worth of usecs.
+    // since we can expect activity once every period, but we might have some
+    // offset, the safe value is two periods.
+    int timeout_usec = 2*1000LL * 1000LL * m_period / m_nominal_framerate;
+    debugOutput(DEBUG_LEVEL_VERBOSE, "setting activity timeout to %d\n", timeout_usec);
+    setActivityWaitTimeoutUsec(timeout_usec);
+
-    return true;
-}

branches/libffado-2.0/src/libstreaming/StreamProcessorManager.h

@@ -95 +95 @@
-    void setNbBuffers(unsigned int nb_buffers)
-            {m_nb_buffers = nb_buffers;};
-
+unsigned 
-            {return m_nb_buffers;};
+
+    // this is the amount of usecs we wait before an activity
+    // timeout occurs.
+    void setActivityWaitTimeoutUsec(int usec)
+            {m_activity_wait_timeout_usec = usec;};
+    int getActivityWaitTimeoutUsec() 
+            {return m_activity_wait_timeout_usec;};
-
-    int getPortCount(enum Port::E_PortType, enum Port::E_Direction);