Changeset 1263

Timestamp:

06/21/08 07:05:50 (13 years ago)

Author:

ppalmers

Message:

improve the behavior when confronted with dying iso transmit handlers (usually due to host controller issues)

Files:

• branches/libffado-2.0/src/devicemanager.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/ffadodevice.h (modified) (1 diff)
• branches/libffado-2.0/src/libieee1394/IsoHandler.cpp (modified) (21 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandler.h (modified) (4 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp (modified) (15 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandlerManager.h (modified) (3 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (12 diffs)
• branches/libffado-2.0/src/libstreaming/StreamProcessorManager.h (modified) (3 diffs)
• branches/libffado-2.0/src/libutil/Thread.h (modified) (1 diff)

branches/libffado-2.0/src/devicemanager.cpp

@@ -68 +68 @@
-    , m_avDevicesLock( new Util::PosixMutex() )
-    , m_BusResetLock( new Util::PosixMutex() )
-
+ *this 
-    , m_deviceStringParser( new DeviceStringParser() )
-    , m_used_cache_last_time( false )
@@ -956 +956 @@
-}
-
-
-void
-DeviceManager::setVerboseLevel(int l)

branches/libffado-2.0/src/ffadodevice.h

@@ -42 +42 @@
-namespace Streaming {
-    class StreamProcessor;
-    class StreamProcessorManager;
-}
-

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

@@ -63 +63 @@
-                        unsigned int length, unsigned char channel,
-                        unsigned char tag, unsigned char sy, unsigned int cycle,
-1
+
-
-    IsoHandler *recvHandler = static_cast<IsoHandler *>(raw1394_get_userdata(handle));
-    assert(recvHandler);
-
-
-
-
-
+
-}
-
@@ -92 +89 @@
-   , m_last_cycle( -1 )
-   , m_last_now( 0xFFFFFFFF )
+   , m_last_packet_handled_at( 0xFFFFFFFF )
-   , m_Client( 0 )
-   , m_speed( RAW1394_ISO_SPEED_400 )
@@ -100 +98 @@
-   , m_packets ( 0 )
-   , m_dropped( 0 )
+   , m_skipped( 0 )
-   , m_min_ahead( 7999 )
-#endif
@@ -115 +114 @@
-   , m_last_cycle( -1 )
-   , m_last_now( 0xFFFFFFFF )
+   , m_last_packet_handled_at( 0xFFFFFFFF )
-   , m_Client( 0 )
-   , m_speed( RAW1394_ISO_SPEED_400 )
@@ -122 +122 @@
-   , m_packets ( 0 )
-   , m_dropped( 0 )
+   , m_skipped( 0 )
-   , m_min_ahead( 7999 )
-#endif
@@ -138 +139 @@
-   , m_last_cycle( -1 )
-   , m_last_now( 0xFFFFFFFF )
+   , m_last_packet_handled_at( 0xFFFFFFFF )
-   , m_Client( 0 )
-   , m_speed( speed )
@@ -145 +147 @@
-   , m_packets( 0 )
-   , m_dropped( 0 )
+   , m_skipped( 0 )
+   , m_min_ahead( 7999 )
-#endif
-{
@@ -169 +173 @@
-    if(m_Client) {
-        bool result;
+
-        if (m_type == eHT_Receive) {
-            result = m_Client->canProducePacket();
@@ -175 +180 @@
-        }
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, " returns %d\n", result);
-
+ && (m_State != E_Error)
-    } else {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, " no client\n");
@@ -261 +266 @@
-    }
-
+    // wake up any waiting reads/polls
+    raw1394_wake_up(m_handle);
+
-    // this is put here to try and avoid the
-    // Runaway context problem
-    // don't know if it will help though.
-
+
+
+
-    raw1394_iso_stop(m_handle);
-    m_State = E_Prepared;
@@ -308 +318 @@
-IsoHandler::notifyOfDeath()
-{
+    m_State = E_Error;
+
-    // notify the client of the fact that we have died
-    m_Client->handlerDied();
+
+    // wake ourselves up
+    raw1394_wake_up(m_handle);
-}
-
@@ -331 +346 @@
-    }
-    #ifdef DEBUG
-
-
+, %4u
+, m_skipped
-    #endif
-
@@ -340 +355 @@
-{
-    setDebugLevel(l);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-}
-
@@ -381 +397 @@
-                    unsigned char *data, unsigned int length,
-                    unsigned char channel, unsigned char tag, unsigned char sy,
-, unsigned int skipped
+
-
-    // keep track of dropped cycles
@@ -389 +405 @@
-        #ifdef DEBUG
-        if (dropped_cycles < 0) {
-, 'skipped'=%u
-, skipped
+
+
-        }
-        if (dropped_cycles > 0) {
-            debugOutput(DEBUG_LEVEL_NORMAL,
-'skipped'=%u, 
-skipped, 
+
+
-            m_dropped += dropped_cycles;
-        }
@@ -477 +493 @@
-    }
-    #endif
+    m_last_packet_handled_at = pkt_ctr;
-
-    // leave the offset field (for now?)
-
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-
-
+, at %08X
+, pkt_ctr
-    #ifdef DEBUG
-    m_packets++;
@@ -496 +513 @@
-    // iterate the client if required
-    if(m_Client) {
-, skipped
+
-        if (retval == RAW1394_ISO_OK) {
-            if (m_dont_exit_iterate_loop) {
@@ -527 +544 @@
-        pkt_ctr = cycle << 12;
-
-#if 0 // we don't need this for xmit
-        // if we assume that one iterate() loop doesn't take longer than 0.5 seconds,
-        // the seconds field won't change while the iterate loop runs
@@ -560 +576 @@
-        uint32_t pkt_ctr_ref = cycle << 12;
-        pkt_ctr_ref |= (now_secs_ref & 0x7F) << 25;
-
+
-        if(pkt_ctr != pkt_ctr_ref) {
-            debugWarning("reconstructed CTR counter discrepancy\n");
@@ -566 +582 @@
-        }
-        #endif
-
-
-
+
+
+
+
+
+
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-
-
+, at %08X
+, pkt_ctr
-
-    #ifdef DEBUG
@@ -593 +612 @@
-                        "(%p) skipped %d cycles, cycle: %d, last_cycle: %d, dropped: %d\n", 
-                        this, skipped, cycle, m_last_cycle, dropped);
+            m_skipped += skipped;
-        }
-        if (dropped_cycles < 0) { 

branches/libffado-2.0/src/libieee1394/IsoHandler.h

@@ -69 +69 @@
-            putPacket(unsigned char *data, unsigned int length,
-                        unsigned char channel, unsigned char tag, unsigned char sy,
-, unsigned int skipped
+
-
-    static enum raw1394_iso_disposition iso_transmit_handler(raw1394handle_t handle,
@@ -161 +161 @@
-     */
-    uint32_t getLastIterateTime() {return m_last_now;};
+
+    /**
+     * @brief returns the CTR value saved at the last iterate handler call
+     * @return CTR value saved at last iterate handler call
+     */
+    uint32_t getLastPacketTime() {return m_last_packet_handled_at;};
-
-    void notifyOfDeath();
@@ -172 +178 @@
-    int             m_last_cycle;
-    uint32_t        m_last_now;
+    uint32_t        m_last_packet_handled_at;
-
-    Streaming::StreamProcessor *m_Client; // FIXME: implement with functors
@@ -189 +196 @@
-        E_Prepared,
-        E_Running,
-
+,
-    };
-    enum EHandlerStates m_State;
-
+public:
-    #ifdef DEBUG
-    unsigned int    m_packets;
-    unsigned int    m_dropped;
+    unsigned int    m_skipped;
-    int             m_min_ahead;
-    #endif
-
+protected:
-    DECLARE_DEBUG_MODULE;
-};

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

@@ -47 +47 @@
-    , m_SyncIsoHandler ( NULL )
-    , m_handlerType( t )
+    , m_running( false )
-{
-}
@@ -73 +74 @@
-
-    sem_init(&m_activity_semaphore, 0, 0);
+    m_running = true;
-    return true;
-}
@@ -81 +83 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) enter\n", this);
-    INC_ATOMIC(&request_update);
+
+    if (m_running) {
+        int timeout = 1000;
+        while(request_update && timeout--) {
+            Util::SystemTimeSource::SleepUsecRelative(1000);
+        }
+        if(timeout == 0) {
+            debugError("timeout waiting for shadow map update\n");
+        }
+    }
+    debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) exit\n", this);
-    return true;
-}
@@ -139 +152 @@
-IsoTask::Execute()
-{
-Extreme(DEBUG_LEVEL_VERY
-       
-       
+(DEBUG_LEVEL_ULTRA
+
+
-    int err;
-    unsigned int i;
@@ -157 +170 @@
-        if(m_successive_short_loops > 10000) {
-            debugError("Shutting down runaway thread\n");
+            m_running = false;
-            return false;
-        }
@@ -209 +223 @@
-
-        if(no_one_to_poll) {
-Extreme(DEBUG_LEVEL
-       
-       
+(DEBUG_LEVEL_ULTRA
+
+
-            // wait for something to happen
-            switch(waitForActivity()) {
@@ -247 +261 @@
-        }
-        debugFatal("poll error: %s\n", strerror (errno));
+        m_running = false;
-        return false;
-    }
@@ -255 +270 @@
-    for (i = 0; i < m_poll_nfds_shadow; i++) {
-        // figure out if a handler has died
-
-now and then. If they aren't, the handler has died.
-call = m_IsoHandler_map_shadow[i]->getLastIterate
-call
+
+this is the time of the last packet we saw in the iterate() handler
+packet_seen = m_IsoHandler_map_shadow[i]->getLastPacket
+packet_seen
-            // this was not iterated yet, so can't be dead
+            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
+                        "(%p, %s) handler %d didn't see any packets yet\n",
+                        this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"), i);
-            continue;
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        if(measured_diff_ticks > max_diff_ticks) {
-            debugFatal("(%p, %s) Handler died: now: %08lX, last: %08lX, diff: %lld (max: %lld)\n",
-                       this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"),
-call
+packet_seen
-            m_IsoHandler_map_shadow[i]->notifyOfDeath();
-            handler_died = true;
@@ -277 +299 @@
-    }
-    if(handler_died) {
+        m_running = false;
-        return false; // one or more handlers have died
-    }
@@ -361 +384 @@
-    }
-
-Extreme(DEBUG_LEVEL
-       
-       
+(DEBUG_LEVEL_ULTRA
+
+
-    return eAR_Activity;
-}
@@ -372 +395 @@
-    // signal the activity cond var
-    sem_post(&m_activity_semaphore);
-Extreme(DEBUG_LEVEL
-       
-       
+(DEBUG_LEVEL_ULTRA
+
+
-}
-
-void IsoTask::setVerboseLevel(int i) {
-    setDebugLevel(i);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", i );
-}
-
@@ -643 +667 @@
-bool IsoHandlerManager::registerStream(StreamProcessor *stream)
-{
-stream %p\n",
+%s stream %p\n", stream->getTypeString(), 
-    assert(stream);
-
@@ -768 +792 @@
-bool IsoHandlerManager::unregisterStream(StreamProcessor *stream)
-{
-stream %p\n",
+%s stream %p\n", stream->getTypeString(), 
-    assert(stream);
-
@@ -896 +920 @@
-    {
-        if((*it)->isStreamRegistered(stream)) {
-return 
+
-        }
-    }
-    debugError("Stream %p has no attached handler\n", stream);
-    return;
+}
+
+IsoHandler *
+IsoHandlerManager::getHandlerForStream(Streaming::StreamProcessor *stream) {
+    for ( IsoHandlerVectorIterator it = m_IsoHandlers.begin();
+      it != m_IsoHandlers.end();
+      ++it )
+    {
+        if((*it)->isStreamRegistered(stream)) {
+            return (*it);
+        }
+    }
+    debugError("Stream %p has no attached handler\n", stream);
+    return NULL;
-}
-
@@ -1006 +1044 @@
-    if(m_IsoThreadReceive)  m_IsoThreadReceive->setVerboseLevel(i);
-    if(m_IsoTaskReceive)    m_IsoTaskReceive->setVerboseLevel(i);
+    setDebugLevel(i);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", i );
-}
-

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

@@ -43 +43 @@
-namespace Streaming {
-    class StreamProcessor;
-    class StreamProcessorManager;
-    typedef std::vector<StreamProcessor *> StreamProcessorVector;
-    typedef std::vector<StreamProcessor *>::iterator StreamProcessorVectorIterator;
@@ -113 +112 @@
-
-        enum IsoHandler::EHandlerType m_handlerType;
+        bool m_running;
+
-        // debug stuff
-        DECLARE_DEBUG_MODULE;
@@ -180 +181 @@
-
-        void flushHandlerForStream(Streaming::StreamProcessor *stream);
+        IsoHandler * getHandlerForStream(Streaming::StreamProcessor *stream);
-
-        Ieee1394Service& get1394Service() {return m_service;};

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp

@@ -109 +109 @@
-    m_state = ePS_Stopped;
-    m_in_xrun = true;
+    SIGNAL_ACTIVITY_ALL;
-}
-
@@ -287 +288 @@
-                           unsigned char channel, unsigned char tag, unsigned char sy,
-                           uint32_t pkt_ctr,
-, unsigned int skipped
+
-    // bypass based upon state
-#ifdef DEBUG
@@ -1793 +1794 @@
-    #ifdef DEBUG
-    debugOutputShort( DEBUG_LEVEL_NORMAL, " StreamProcessor %p, %s:\n", this, ePTToString(m_processor_type));
-
+
+
+
+
+
+
+
+
-    uint64_t now = m_1394service.getCycleTimerTicks();
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Now                   : %011llu (%03us %04uc %04ut)\n",

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h

@@ -152 +152 @@
-        putPacket(unsigned char *data, unsigned int length,
-                  unsigned char channel, unsigned char tag, unsigned char sy,
-, unsigned int skipped
+
-
-    enum raw1394_iso_disposition

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

@@ -28 +28 @@
-#include "libieee1394/cycletimer.h"
-
+#include "devicemanager.h"
+
-#include "libutil/Time.h"
-
@@ -38 +40 @@
-IMPL_DEBUG_MODULE( StreamProcessorManager, StreamProcessorManager, DEBUG_LEVEL_VERBOSE );
-
-
+DeviceManager &p
-    : m_is_slave( false )
-    , m_SyncSource(NULL)
+    , m_parent( p )
-    , m_xrun_happened( false )
-    , m_activity_wait_timeout_usec( 1000*1000 )
@@ -56 +59 @@
-}
-
-
+
+
-    : m_is_slave( false )
-    , m_SyncSource(NULL)
+    , m_parent( p )
-    , m_xrun_happened( false )
-    , m_activity_wait_timeout_usec( 1000*1000 )
@@ -698 +703 @@
-        } else {
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Sync start try %d failed...\n", ntries);
+            if(m_shutdown_needed) {
+                debugOutput(DEBUG_LEVEL_VERBOSE, "Some fatal error occurred, stop trying.\n");
+                return false;
+            }
-        }
-    }
@@ -704 +713 @@
-        return false;
-    }
-
+
-    return true;
-}
@@ -815 +824 @@
-        return false;
-    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, " Stopped...\n");
-    return true;
-}
@@ -900 +910 @@
-            case eAR_Error:
-                debugError("Error while waiting for activity\n");
+                m_shutdown_needed = true;
-                return false;
-            case eAR_Interrupted:
@@ -906 +917 @@
-                break;
-            case eAR_Timeout:
-                // FIXME: what to do here?
-                debugWarning("Timeout while waiting for activity\n");
-
+
+
+
+
+
+
+
+
+
+
-            case eAR_Activity:
-                // do nothing
@@ -1215 +1234 @@
-
-void StreamProcessorManager::setVerboseLevel(int l) {
-    setDebugLevel(l);
-    if(m_WaitLock) m_WaitLock->setVerboseLevel(l);
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, " Receive processors...\n");
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-        it != m_ReceiveProcessors.end();
@@ -1224 +1241 @@
-        (*it)->setVerboseLevel(l);
-    }
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, " Transmit processors...\n");
-    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-        it != m_TransmitProcessors.end();
@@ -1231 +1246 @@
-        (*it)->setVerboseLevel(l);
-    }
-
-
+
+
+
-
-int StreamProcessorManager::getPortCount(enum Port::E_PortType type, enum Port::E_Direction direction) {
@@ -1273 +1289 @@
-
-// TODO: implement a port map here, instead of the loop
-
-Port* StreamProcessorManager::getPortByIndex(int idx, enum Port::E_Direction direction) {
-    int count=0;

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

@@ -36 +36 @@
-#include <semaphore.h>
-
+class DeviceManager;
+
-namespace Streaming {
-
@@ -56 +58 @@
-    };
-
-
-
+
+
+
-    virtual ~StreamProcessorManager();
-
@@ -157 +160 @@
-protected: // FIXME: private?
-
+    // parent device manager
+    DeviceManager &m_parent;
+
-    // thread related vars
-    bool m_xrun_happened;

branches/libffado-2.0/src/libutil/Thread.h

@@ -113 +113 @@
-
-        virtual void setVerboseLevel(int l)
-
+
+
+
-    protected:
-            DECLARE_DEBUG_MODULE;