Changeset 2171 for trunk/libffado/src/libieee1394

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/libieee1394/ieee1394service.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (1 diff)

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;