Changeset 868

Timestamp:

01/20/08 05:05:57 (14 years ago)

Author:

ppalmers

Message:

detect when a handler has died on us

Files:

• trunk/libffado/config.h.in (modified) (2 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (7 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.h (modified) (2 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (3 diffs)

trunk/libffado/config.h.in

@@ -46 +46 @@
-#define DEBUG_EXTREME_ENABLE        0
-
-1
+0
-#define IEEE1394SERVICE_CYCLETIMER_DLL_UPDATE_INTERVAL_USEC 50000
-#define IEEE1394SERVICE_MAX_FIREWIRE_PORTS  16
@@ -62 +62 @@
-#define ISOHANDLER_USE_POLL                 0
-#define ISOHANDLER_FLUSH_BEFORE_ITERATE     0
+
+#define ISOHANDLER_DEATH_DETECT_TIMEOUT_USECS    1000000LL
-
-#define ISOHANDLERMANAGER_MAX_ISO_HANDLERS_PER_PORT         16

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -83 +83 @@
-   , m_max_packet_size( 1024 )
-   , m_irq_interval( -1 )
+   , m_last_wakeup( -1 )
-   , m_Client( 0 )
-   , m_poll_timeout( 100 )
@@ -102 +103 @@
-   , m_max_packet_size( max_packet_size )
-   , m_irq_interval( irq )
+   , m_last_wakeup( -1 )
-   , m_Client( 0 )
-   , m_poll_timeout( 100 )
@@ -122 +124 @@
-   , m_max_packet_size( max_packet_size )
-   , m_irq_interval( irq )
+   , m_last_wakeup( -1 )
-   , m_Client( 0 )
-   , m_poll_timeout( 100 )
@@ -163 +166 @@
-    }
-    return true;
+}
+
+bool
+IsoHandler::isDead()
+{
+    if(m_last_wakeup < 0) return false; // startup artifacts
+    if(m_State != E_Running) return false; // not running can't be dead
+    int64_t now = m_manager.get1394Service().getCurrentTimeAsUsecs();
+    int64_t last_call = m_last_wakeup + ISOHANDLER_DEATH_DETECT_TIMEOUT_USECS;
+    if(now > last_call) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,
+                    "(%p, %s) Handler timed out: %lld usecs since last wakeup\n",
+                    this, getTypeString(), now-m_last_wakeup);
+        return true;
+    } else {
+        return false;
+    }
-}
-
@@ -473 +493 @@
-                       "received packet: length=%d, channel=%d, cycle=%d\n",
-                       length, channel, cycle);
+    #ifdef DEBUG
+    m_last_wakeup = m_manager.get1394Service().getCurrentTimeAsUsecs();
+    #endif
-    if(m_Client) {
-        return m_Client->putPacket(data, length, channel, tag, sy, cycle, dropped);
@@ -489 +512 @@
-                       "sending packet: length=%d, cycle=%d\n",
-                       *length, cycle);
+    #ifdef DEBUG
+    m_last_wakeup = m_manager.get1394Service().getCurrentTimeAsUsecs();
+    #endif
-    if(m_Client) {
-        return m_Client->getPacket(data, length, tag, sy, cycle, dropped, m_max_packet_size);
@@ -511 +537 @@
-    //     raw1394_iso_shutdown(m_handle);
-    m_State = E_Prepared;
+    m_last_wakeup = -1;
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Preparing iso handler (%p, client=%p)\n", this, m_Client);

trunk/libffado/src/libieee1394/IsoHandler.h

@@ -98 +98 @@
-    bool disable();
-
+    bool isDead();
+
-    void flush();
-    enum EHandlerType getType() {return m_type;};
@@ -135 +137 @@
-    int             m_irq_interval;
-
+    int64_t         m_last_wakeup;
+
-    Streaming::StreamProcessor *m_Client;
-

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -106 +106 @@
-            // receive handlers are always poll'ed
-            // transmit handlers only when the client is ready
-getType() == IsoHandler::eHT_Receive || h->
+
-                m_IsoHandler_map_shadow[cnt] = h;
-                m_poll_fds_shadow[cnt].fd = h->getFileDescriptor();
@@ -171 +171 @@
-    for (i = 0; i < m_poll_nfds_shadow; i++) {
-        if(m_poll_fds_shadow[i].revents) {
-
-
+
+
+
+
+
+
-        }
-        if (m_poll_fds_shadow[i].revents & POLLERR) {
@@ -194 +198 @@
-            }
-        }
+
+        #ifdef DEBUG
+        // check if the handler is still alive
+        if(m_IsoHandler_map_shadow[i]->isDead()) {
+            debugError("Iso handler %p (%s) is dead!\n",
+                       m_IsoHandler_map_shadow[i],
+                       m_IsoHandler_map_shadow[i]->getTypeString());
+            return false; // shutdown the system
+        }
+        #endif
+        
-    }
-    DEBUG_EXTREME( uint64_t iter_exit = m_service.getCurrentTimeAsUsecs() );