Changeset 2171 for trunk

Timestamp:

06/23/12 07:03:54 (9 years ago)

Author:

jwoithe

Message:

A second pass at addressing ticket #242. Define a global clock source within the SystemTimeSource? object and use this whenever clock_gettime() is called. On systems which support the new raw1394_read_cycle_timer_and_clock() libraw1394 call and CLOCK_MONOTONIC_RAW, these changes should ensure that all timing-sensitive parts of FFADO are using the same clock source. System tests under tests/systemtests/ have not been converted to use this new framework because they exist for different purposes and are not using the FFADO streaming infrastructure.

Files:

• trunk/libffado/src/bebob/bebob_dl_mgr.cpp (modified) (1 diff)
• trunk/libffado/src/debugmodule/debugmodule.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/PosixMessageQueue.cpp (modified) (4 diffs)
• trunk/libffado/src/libutil/SystemTimeSource.cpp (modified) (5 diffs)
• trunk/libffado/src/libutil/SystemTimeSource.h (modified) (3 diffs)

trunk/libffado/src/bebob/bebob_dl_mgr.cpp

@@ -575 +575 @@
-    struct timespec timeout;
-    int retcode;
-clock_gettime(CLOCK_REALTIME, 
+Util::SystemTimeSource::clockGettime(
-    do {
-        printf(".");

trunk/libffado/src/debugmodule/debugmodule.cpp

@@ -27 +27 @@
-#include <stdarg.h>
-#include "libutil/ByteSwap.h"
+#include "libutil/Time.h"
-
-#include <iostream>
@@ -180 +181 @@
-    // add a timing timestamp
-    struct timespec ts;
-clock_gettime(CLOCK_MONOTONIC, 
+Util::SystemTimeSource::clockGettime(
-    uint64_t ts_usec=(uint64_t)(ts.tv_sec * 1000000LL + ts.tv_nsec / 1000LL);
-

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -2 +2 @@
- * Copyright (C) 2005-2008 by Daniel Wagner
- * Copyright (C) 2005-2008 by Pieter Palmers
+ * Copyright (C) 2012 by Jonathan Woithe
- *
- * This file is part of FFADO
@@ -351 +352 @@
-        if (raw1394_read_cycle_timer_and_clock != NULL) {
-            err = raw1394_read_cycle_timer_and_clock(m_util_handle, &cycle_timer, &local_time, CLOCK_MONOTONIC_RAW);
-
+ && Util::SystemTimeSource::setSource(CLOCK_MONOTONIC_RAW)==true
-                m_have_read_ctr_and_clock = true;
-        }
-
-
-
-
+
+
+
+
-            debugOutput(DEBUG_LEVEL_VERBOSE, "This system supports the raw1394_read_cycle_timer call, using it.\n");
-
+
+
-            debugOutput(DEBUG_LEVEL_NORMAL, "Fallback to raw1394_read_cycle_timer.\n");
-            debugOutput(DEBUG_LEVEL_NORMAL, "FFADO may be susceptible to NTP-induced clock discontinuities.\n");
-
+
+
-        }
-    }
@@ -538 +542 @@
-    if (m_have_read_ctr_and_clock) {
-        int err;
-
+
+
-        if(err) {
-            debugWarning("raw1394_read_cycle_timer_and_clock: %s\n", strerror(err));

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -398 +398 @@
-    int result;
-
-clock_gettime(CLOCK_REALTIME, 
+Util::SystemTimeSource::clockGettime(
-        debugError("clock_gettime failed\n");
-        return eAR_Error;

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -164 +164 @@
-    if (m_activity_wait_timeout_nsec >= 0) {
-
-clock_gettime(CLOCK_REALTIME, 
+Util::SystemTimeSource::clockGettime(
-            debugError("clock_gettime failed\n");
-            return eAR_Error;

trunk/libffado/src/libutil/PosixMessageQueue.cpp

@@ -26 +26 @@
-#include "Functors.h"
-#include "PosixMutex.h"
+#include "Time.h"
-
-#include <errno.h>
@@ -197 +198 @@
-    while(countMessages()) {
-        struct timespec timeout;
-clock_gettime(CLOCK_REALTIME, 
+Util::SystemTimeSource::clockGettime(
-        timeout.tv_sec += m_timeout.tv_sec;
-        timeout.tv_nsec += m_timeout.tv_nsec;
@@ -247 +248 @@
-
-    struct timespec timeout;
-clock_gettime(CLOCK_REALTIME, 
+Util::SystemTimeSource::clockGettime(
-    timeout.tv_sec += m_timeout.tv_sec;
-    timeout.tv_nsec += m_timeout.tv_nsec;
@@ -293 +294 @@
-
-    struct timespec timeout;
-clock_gettime(CLOCK_REALTIME, 
+Util::SystemTimeSource::clockGettime(
-    timeout.tv_sec += m_timeout.tv_sec;
-    timeout.tv_nsec += m_timeout.tv_nsec;

trunk/libffado/src/libutil/SystemTimeSource.cpp

@@ -1 +1 @@
-/*
- * Copyright (C) 2005-2008 by Pieter Palmers
+ * Copytight (C) 2012 by Jonathan Woithe
- *
- * This file is part of FFADO
@@ -37 +38 @@
-namespace Util {
-
+static clockid_t clock_id = CLOCK_REALTIME;
+
+bool
+SystemTimeSource::setSource(clockid_t id)
+{
+    struct timespec tp;
+    // Determine at runtime whether the kernel has support for the
+    // requested clock source.
+    if (clock_gettime(id, &tp) == 0) {
+        clock_id = id;
+        return true;
+    }
+    return false;
+}
+
+clockid_t
+SystemTimeSource::getSource(void)
+{
+    return clock_id;
+}
+
+int
+SystemTimeSource::clockGettime(struct timespec *tp)
+{
+    return clock_gettime(clock_id, tp);
+}
+
-void
-SystemTimeSource::SleepUsecRelative(ffado_microsecs_t usecs)
@@ -44 +72 @@
-    ts.tv_sec = usecs / (1000000LL);
-    ts.tv_nsec = (usecs % (1000000LL)) * 1000LL;
-CLOCK_REALTIME
+clock_id
-}
-
@@ -57 +85 @@
-                       "clock_nanosleep until %"PRId64" sec, %"PRId64" nanosec\n",
-                       (int64_t)ts.tv_sec, (int64_t)ts.tv_nsec);
-CLOCK_REALTIME
+clock_id
-    if(err) {
-        // maybe signal occurred, but we're going to ignore that
@@ -95 +123 @@
-{
-    struct timespec ts;
-CLOCK_REALTIME
+clock_id
-    return (ffado_microsecs_t)(ts.tv_sec * 1000000LL + ts.tv_nsec / 1000LL);
-}

trunk/libffado/src/libutil/SystemTimeSource.h

@@ -1 +1 @@
-/*
- * Copyright (C) 2005-2008 by Pieter Palmers
+ * Copyright (C) 2012 by Jonathan Woithe
- *
- * This file is part of FFADO
@@ -31 +32 @@
-typedef uint64_t ffado_microsecs_t;
-
+// Ensure this is defined even for kernels/glib versions which don't include
+// it.  This allows compile-time testing for the feature.
+#ifndef CLOCK_MONOTONIC_RAW
+#define CLOCK_MONOTONIC_RAW 4
+#endif
+
-namespace Util {
-
@@ -40 +47 @@
-
-public:
+    static bool setSource(clockid_t id);
+    static clockid_t getSource(void);
+    static int clockGettime(struct timespec *tp);
+
-    static ffado_microsecs_t getCurrentTime();
-    static ffado_microsecs_t getCurrentTimeAsUsecs();