Changeset 776

Timestamp:

12/26/07 07:26:00 (15 years ago)

Author:

ppalmers

Message:

try to fix deadlock / performace issues

Files:

• trunk/libffado/src/debugmodule/debugmodule.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (5 diffs)

trunk/libffado/src/debugmodule/debugmodule.h

@@ -53 +53 @@
-#define MB_BUFFERSIZE       DEBUG_MAX_MESSAGE_LENGTH
-
-// 
+
-#ifdef IMPLEMENT_BACKLOG
-// the backlog is a similar buffer as the message buffer
-#define BACKLOG_MB_BUFFERS      (256)
-#define BACKLOG_MB_NEXT(index)  (((index)+1) & (BACKLOG_MB_BUFFERS-1))
-
+Y_VER
-#endif
-

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -183 +183 @@
-    }
-
+#ifdef DO_POLL
-    uint64_t poll_enter = m_manager.get1394Service().getCurrentTimeAsUsecs();
-    err = poll(&m_poll_fd, 1, m_poll_timeout);
@@ -215 +216 @@
-                (this->getType()==eHT_Receive?'R':'X'), this, 
-                poll_exit-poll_enter, iter_exit-iter_enter);
+#else
+    // iterate itself blocks if nothing is available
+    // so poll'ing is not really necessary
+    bool result = iterate();
+    usleep(125);
+    return result;
+#endif
-    return true;
-}

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -356 +356 @@
-        if(irq_interval <= 0) irq_interval=1;
-        // FIXME: test
-
+//
-
-#else
@@ -440 +440 @@
-            debugError("Max packet size too large! (%d)\n", stream->getMaxPacketSize());
-        }
-
+//
-#endif
-        // the SP specifies how many packets to buffer

trunk/libffado/src/libieee1394/IsoHandlerManager.h

@@ -34 +34 @@
-#include <vector>
-
-// 
+
-
-#define FFADO_MAX_ISO_HANDLERS_PER_PORT 16

trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -162 +162 @@
-        else
-        {
+            unsigned int now_cycle = ( unsigned int ) ( TICKS_TO_CYCLES ( m_1394service.getCycleTimerTicks() ) );
+
-            debugOutput ( DEBUG_LEVEL_VERBOSE,
-
-
-
-
+
+
+
+
+
-            // there is still time left to send the packet
-            // we want the system to give this packet another go at a later time instant
@@ -213 +216 @@
-                        transmit_at_cycle, cycles_until_transmit,
-                        presentation_time, (unsigned int)TICKS_TO_CYCLES(presentation_time) );
-
+
+
-            // however, if we can send this sufficiently before the presentation
-            // time, it could be harmless.

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

@@ -113 +113 @@
-    // however we have to take into account the fact that there is some sync delay (unknown at this point)
-    packets_to_prebuffer -= 16; //FIXME: magic
+    
+    // only queue a part (80%) of the theoretical max in order not to have too much 'not ready' cycles
+    packets_to_prebuffer = (packets_to_prebuffer * 8000) / 10000;
-    
-    return packets_to_prebuffer;
@@ -615 +618 @@
-                }
-            }
-
-
+
+
+
+
-        } else {
-            debugError("Invalid return value: %d\n", result);

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -410 +410 @@
-    // wait for the syncsource to start running.
-    // that will block the waitForPeriod call until everyone has started (theoretically)
-
+0
-    while (!m_SyncSource->isRunning() && cnt) {
-        usleep(125);
@@ -432 +432 @@
-StreamProcessorManager::alignReceivedStreams()
-{
-NB_PERIODS_FOR_ALIGN_AVERAGE 2
-2
+ALIGN_AVERAGE_TIME_MSEC 20
+4
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Aligning received streams...\n");
-    unsigned int nb_sync_runs;
@@ -442 +442 @@
-    unsigned int i;
-
+    unsigned int periods_per_align_try = (ALIGN_AVERAGE_TIME_MSEC * getNominalRate());
+    periods_per_align_try /= 1000;
+    periods_per_align_try /= getPeriodSize();
+    debugOutput( DEBUG_LEVEL_VERBOSE, " averaging over %u periods...\n", periods_per_align_try);
+
-    bool aligned = false;
-    int cnt = NB_ALIGN_TRIES;
-    while (!aligned && cnt--) {
-NB_PERIODS_FOR_ALIGN_AVERAGE
+periods_per_align_try
-        while(nb_sync_runs) {
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE, " check (%d)...\n", nb_sync_runs);
@@ -456 +461 @@
-                debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "  offset between SyncSP %p and SP %p is %lld ticks...\n", 
-                    m_SyncSource, s, diff);
-NB_PERIODS_FOR_ALIGN_AVERAGE
+periods_per_align_try
-                    diff_between_streams[i] = diff;
-                } else {
@@ -475 +480 @@
-            StreamProcessor *s = m_ReceiveProcessors.at(i);
-
-NB_PERIODS_FOR_ALIGN_AVERAGE
+periods_per_align_try
-            diff_between_streams_frames[i] = (int)roundf(diff_between_streams[i] / s->getTicksPerFrame());
-            debugOutput( DEBUG_LEVEL_VERBOSE, "   avg offset between SyncSP %p and SP %p is %lld ticks, %d frames...\n",