Changeset 863

Timestamp:

01/19/08 14:36:47 (16 years ago)

Author:

ppalmers

Message:

fix cycle timer DLL code

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (14 diffs)
• trunk/libffado/src/libieee1394/CycleTimerHelper.h (modified) (4 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (4 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (1 diff)
• trunk/libffado/src/libutil/SystemTimeSource.cpp (modified) (3 diffs)
• trunk/libffado/tests/test-ieee1394service.cpp (modified) (6 diffs)

trunk/libffado/config.h.in

@@ -42 +42 @@
-#define DEBUG_IMPLEMENT_BACKLOG 0
-
-
+
+
-#define IEEE1394SERVICE_MAX_FIREWIRE_PORTS  16
-

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -28 +28 @@
-#include "libutil/PosixThread.h"
-
-0
+
-#define DLL_PI        (3.141592653589793238)
-#define DLL_SQRT2     (1.414213562373095049)
@@ -35 +35 @@
-#define DLL_COEFF_C   (DLL_OMEGA * DLL_OMEGA)
-
+#define OFFSET_AVERAGE_COEFF 0.01
-/*
-#define ENTER_CRITICAL_SECTION { \
@@ -63 +64 @@
-    , m_next_time_ticks ( 0 )
-    , m_first_run ( true )
+    , m_sleep_until ( 0 )
-    , m_Thread ( NULL )
-    , m_realtime ( false )
@@ -81 +83 @@
-    , m_next_time_ticks ( 0 )
-    , m_first_run ( true )
+    , m_sleep_until ( 0 )
-    , m_Thread ( NULL )
-    , m_realtime ( rt )
@@ -143 +146 @@
-}
-
+#if IEEE1394SERVICE_USE_CYCLETIMER_DLL
-float
-CycleTimerHelper::getRate()
@@ -158 +162 @@
-}
-
-#if IEEE1394SERVICE_USE_CYCLETIMER_DLL
-
-bool
-CycleTimerHelper::Execute()
-{
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Execute %p...\n", this);
+    if (!m_first_run) {
+        // wait for the next update period
+        ffado_microsecs_t now = m_TimeSource.getCurrentTimeAsUsecs();
+        int sleep_time = m_sleep_until - now;
+        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "(%p) Sleep until %lld/%f (now: %lld, diff=%d) ...\n",
+                    this, m_sleep_until, m_next_time_usecs, now, sleep_time);
+        m_TimeSource.SleepUsecAbsolute(m_sleep_until);
+        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, " (%p) back...\n", this);
+    }
+
-    uint32_t cycle_timer;
-    uint64_t local_time;
@@ -173 +185 @@
-                    cycle_timer, local_time);
-
-    double usecs_late;
-    if (m_first_run) {
-usecs_late = 0.0
+m_sleep_until = local_time + m_usecs_per_update
-        m_dll_e2 = m_ticks_per_update;
-        m_current_time_usecs = local_time;
@@ -188 +199 @@
-        m_first_run = false;
-    } else {
-
-
-
-
-
+
-        uint64_t cycle_timer_ticks = CYCLE_TIMER_TO_TICKS(cycle_timer);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        m_current_time_usecs = m_next_time_usecs;
-
+
+
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, " usecs: current: %f next: %f usecs_late=%f\n",
-                    m_current_time_usecs, m_next_time_usecs, usecs_late);
-
-        // and the y-axis values
-        double diff_ticks = diffTicks(cycle_timer_ticks, (int64_t)m_next_time_ticks);
-        m_current_time_ticks = m_next_time_ticks;
-        m_next_time_ticks = addTicks((uint64_t)m_current_time_ticks,
-                                     (uint64_t)((DLL_COEFF_B * diff_ticks) + m_dll_e2));
-        m_dll_e2 += DLL_COEFF_C * diff_ticks;
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, " ticks: current: %f next: %f diff=%f\n",
-                    m_current_time_ticks, m_next_time_ticks, diff_ticks);
@@ -215 +235 @@
-    }
-
-    // track the average wakeup delay
-    m_avg_wakeup_delay += 0.01 * usecs_late;
-
-    // FIXME: priority inversion!
-    ENTER_CRITICAL_SECTION;
-m_current_time_ticks
-
+(uint64_t)(m_current_time_ticks);// + m_average_offset_ticks)
+(uint64_t)
-    m_current_vars.rate = getRate();
-    EXIT_CRITICAL_SECTION;
-
-    // wait for the next update period
-    int64_t time_to_sleep = (int64_t)m_next_time_usecs - m_Parent.getCurrentTimeAsUsecs();
-    time_to_sleep -= (int64_t)m_avg_wakeup_delay;
-    //int64_t time_to_sleep = m_usecs_per_update;
-    if (time_to_sleep > 0) {
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, " sleeping %lld usecs (avg delay: %f)\n", time_to_sleep, m_avg_wakeup_delay);
-        usleep(time_to_sleep);
-    }
-    return true;
-}
@@ -254 +263 @@
-    EXIT_CRITICAL_SECTION;
-
-double
-time_diff
+int64_t
+((double)time_diff)
-    int64_t y_step_in_ticks_int = (int64_t)y_step_in_ticks;
-(uint64_t)
+
-
-    if (y_step_in_ticks_int > 0) {
@@ -277 +286 @@
-CycleTimerHelper::getCycleTimer()
-{
-
+
+
-}
-
@@ -283 +293 @@
-CycleTimerHelper::getCycleTimer(uint64_t now)
-{
-
+
+
+
+
+
+
+
+
-}
-
-#else
+
+float
+CycleTimerHelper::getRate()
+{
+    return getNominalRate();
+}
+
+float
+CycleTimerHelper::getNominalRate()
+{
+    float rate = ((double)TICKS_PER_SECOND) / 1000000.0;
+    return rate;
+}
-
-bool
@@ -309 +339 @@
-CycleTimerHelper::getCycleTimerTicks(uint64_t now)
-{
+    debugWarning("not implemented!\n");
-    return getCycleTimerTicks();
-}
@@ -327 +358 @@
-CycleTimerHelper::getCycleTimer(uint64_t now)
-{
+    debugWarning("not implemented!\n");
-    return getCycleTimer();
-}

trunk/libffado/src/libieee1394/CycleTimerHelper.h

@@ -21 +21 @@
- *
- */
-
-
-
+
+
-
-/**
@@ -50 +49 @@
- * different clock domains to operate together.
- */
-
-
+
+
+
+
-
-#include "debugmodule/debugmodule.h"
-
-class Ieee1394Service;
-namespace Util {
-    class TimeSource;
-    class Thread;
-}
-
-class CycleTimerHelper : public Util::RunnableInterface
@@ -105 +102 @@
-private:
-    Ieee1394Service &m_Parent;
+    Util::SystemTimeSource m_TimeSource;
-    // parameters
-    uint32_t m_ticks_per_update;
@@ -119 +117 @@
-    double m_next_time_ticks;
-    bool m_first_run;
+    ffado_microsecs_t m_sleep_until;
-
-    // cached vars used for computation
-    struct compute_vars {
-double
-double
+uint64_t
+uint64_t
-        double rate;
-    };

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -53 +53 @@
-    , m_base_priority ( 0 )
-    , m_pIsoManager( new IsoHandlerManager( *this ) )
-10000
+IEEE1394SERVICE_CYCLETIMER_DLL_UPDATE_INTERVAL_USEC
-    , m_have_new_ctr_read ( false )
-    , m_pTimeSource ( new Util::SystemTimeSource() )
@@ -77 +77 @@
-    , m_base_priority ( prio )
-    , m_pIsoManager( new IsoHandlerManager( *this, rt, prio + IEEE1394SERVICE_ISOMANAGER_PRIO_INCREASE ) )
-
+
+
-    , m_have_new_ctr_read ( false )
-    , m_pTimeSource ( new Util::SystemTimeSource() )
@@ -318 +319 @@
-}
-
+/**
+ * Returns the current value of the cycle timer (in ticks)
+ * for a specific time instant (usecs since epoch)
+ * @return the current value of the cycle timer (in ticks)
+ */
+
+uint32_t
+Ieee1394Service::getCycleTimerTicks(uint64_t t) {
+    return m_pCTRHelper->getCycleTimerTicks(t);
+}
+
+/**
+ * Returns the current value of the cycle timer (as is)
+ * for a specific time instant (usecs since epoch)
+ * @return the current value of the cycle timer (as is)
+ */
+uint32_t
+Ieee1394Service::getCycleTimer(uint64_t t) {
+    return m_pCTRHelper->getCycleTimer(t);
+}
+
-bool
-Ieee1394Service::readCycleTimerReg(uint32_t *cycle_timer, uint64_t *local_time)
@@ -1065 +1087 @@
-Ieee1394Service::show()
-{
+    uint32_t cycle_timer;
+    uint64_t local_time;
+    if(!readCycleTimerReg(&cycle_timer, &local_time)) {
+        debugWarning("Could not read cycle timer register\n");
+    }
+    uint64_t ctr = CYCLE_TIMER_TO_TICKS( cycle_timer );
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Port:  %d\n", getPort() );
-    debugOutput( DEBUG_LEVEL_VERBOSE, " Name: %s\n", getPortName().c_str() );
+    debugOutput( DEBUG_LEVEL_VERBOSE, " Time: %011llu (%03us %04ucy %04uticks)\n",
+                ctr,
+                (unsigned int)TICKS_TO_SECS( ctr ),
+                (unsigned int)TICKS_TO_CYCLES( ctr ),
+                (unsigned int)TICKS_TO_OFFSET( ctr ) );
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "Iso handler info:\n");
-    if (m_pIsoManager) m_pIsoManager->dumpInfo();

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -115 +115 @@
-     */
-    uint32_t getCycleTimer();
+
+    /**
+     * @brief get the cycle timer value for a specific time instant (in ticks)
+     *
+     * @note Uses the most appropriate method for getting the cycle timer
+     *       which is not necessarily a direct read (could be DLL)
+     */
+    uint32_t getCycleTimerTicks(uint64_t t);
+
+    /**
+     * @brief get the cycle timer value for a specific time instant (in CTR format)
+     *
+     * @note Uses the most appropriate method for getting the cycle timer
+     *       which is not necessarily a direct read (could be DLL)
+     */
+    uint32_t getCycleTimer(uint64_t t);
-
-    /**

trunk/libffado/src/libutil/SystemTimeSource.cpp

@@ -25 +25 @@
-#include "Time.h"
-
+// needed for clock_nanosleep
+#ifndef _GNU_SOURCE
+    #define _GNU_SOURCE
+#endif
+
+#include <time.h>
+
-namespace Util {
-
@@ -37 +44 @@
-void
-SystemTimeSource::SleepUsecRelative(ffado_microsecs_t usecs) {
-
+
+
+
+
+
-}
-
-void
-
-
+
+
+
+
+
-}
-
@@ -50 +64 @@
-//     return tv.tv_sec * 1000000ULL + tv.tv_usec;
-    struct timespec ts;
-MONOTONIC
+REALTIME
-    return (ffado_microsecs_t)(ts.tv_sec * 1000000LL + ts.tv_nsec / 1000LL);
-}

trunk/libffado/tests/test-ieee1394service.cpp

@@ -47 +47 @@
-
-
-3
-
-90
-1
+1
+ 
+51
+20
-    
-using namespace Util;
@@ -56 +56 @@
-DECLARE_GLOBAL_DEBUG_MODULE;
-
-
-
+
+
+
+
+
-
-int run=1;
@@ -130 +133 @@
-    
-    ctr = CYCLE_TIMER_TO_TICKS( cycle_timer );
-
+local_time
-
-    if(err) {
@@ -149 +152 @@
-    int64_t diff = diffTicks(ctr, ctr_dll);
-    uint64_t abs_diff;
+
+    // not 100% thread safe, but will do
+    if (diff > max_diff) max_diff = diff;
+    if (diff < min_diff) min_diff = diff;
-
-    if (diff < 0) {
@@ -255 +262 @@
-
-    m_service = new Ieee1394Service();
- 
+
-    m_service->initialize(PORT_TO_USE);
-2
+6
-
-    MyFunctor *test_busreset=new MyFunctor();
@@ -315 +322 @@
-    while(run) {
-        i++;
-
+
+
-        sleep(5);
-    }