Changeset 940

Timestamp:

03/12/08 07:05:53 (14 years ago)

Author:

ppalmers

Message:

use RT watchdog for 1394 service threads

Files:

• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (6 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (3 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (2 diffs)

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -28 +28 @@
-#include "libutil/PosixThread.h"
-#include "libutil/Atomic.h"
+#include "libutil/Watchdog.h"
-
-#define DLL_PI        (3.141592653589793238)
@@ -135 +136 @@
-        return false;
-    }
+    // register the thread with the RT watchdog
+    Util::Watchdog *watchdog = m_Parent.getWatchdog();
+    if(watchdog) {
+        if(!watchdog->registerThread(m_Thread)) {
+            debugWarning("could not register update thread with watchdog\n");
+        }
+    } else {
+        debugWarning("could not find valid watchdog\n");
+    }
+    
-    if (m_Thread->Start() != 0) {
-        debugFatal("Could not start update thread\n");

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -35 +35 @@
-
-#include "libutil/SystemTimeSource.h"
+#include "libutil/Watchdog.h"
-
-#include <errno.h>
@@ -56 +57 @@
-    , m_have_new_ctr_read ( false )
-    , m_pTimeSource ( new Util::SystemTimeSource() )
+    , m_pWatchdog ( new Util::Watchdog() )
-{
-    pthread_mutex_init( &m_mutex, 0 );
@@ -82 +84 @@
-    , m_have_new_ctr_read ( false )
-    , m_pTimeSource ( new Util::SystemTimeSource() )
+    , m_pWatchdog ( new Util::Watchdog() )
-{
-    pthread_mutex_init( &m_mutex, 0 );
@@ -114 +117 @@
-
-    delete m_pTimeSource;
+    delete m_pWatchdog;
-    if ( m_handle ) {
-        raw1394_destroy_handle( m_handle );
@@ -152 +156 @@
-    if (port + 1 > nb_ports) {
-        debugFatal("Requested port (%d) out of range (# ports: %d)\n", port, nb_ports);
+    }
+
+    if(!m_pWatchdog) {
+        debugError("No valid RT watchdog found.\n");
+        return false;
+    }
+    if(!m_pWatchdog->start()) {
+        debugError("Could not start RT watchdog.\n");
+        return false;
-    }
-
@@ -1091 +1104 @@
-    if (m_pIsoManager) m_pIsoManager->setVerboseLevel(l);
-    if (m_pCTRHelper) m_pCTRHelper->setVerboseLevel(l);
+    if (m_pWatchdog) m_pWatchdog->setVerboseLevel(l);
-    setDebugLevel(l);
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -45 +45 @@
-namespace Util {
-    class TimeSource;
+    class Watchdog;
-}
-
@@ -55 +56 @@
-    bool initialize( int port );
-    bool setThreadParameters(bool rt, int priority);
+    Util::Watchdog *getWatchdog() {return m_pWatchdog;};
+
-   /**
-    * @brief get number of ports (firewire adapters) in this machine
@@ -331 +334 @@
-    Util::TimeSource*   m_pTimeSource;
-
+    // the RT watchdog
+    Util::Watchdog*     m_pWatchdog;
+
-    typedef std::vector< Util::Functor* > reset_handler_vec_t;
-    reset_handler_vec_t m_busResetHandlers;

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -29 +29 @@
-
-#include "libutil/Atomic.h"
-
-#include "libutil/PosixThread.h"
-
-#include "libutil/SystemTimeSource.h"
+#include "libutil/Watchdog.h"
-
-#include <assert.h>
@@ -335 +334 @@
-        return false;
-    }
+    // register the thread with the RT watchdog
+    Util::Watchdog *watchdog = m_service.getWatchdog();
+    if(watchdog) {
+        if(!watchdog->registerThread(m_IsoThread)) {
+            debugWarning("could not register iso thread with watchdog\n");
+        }
+    } else {
+        debugWarning("could not find valid watchdog\n");
+    }
+
-    if (m_IsoThread->Start() != 0) {
-        debugFatal("Could not start ISO thread\n");