Changeset 907

Timestamp:

03/06/08 11:18:43 (13 years ago)

Author:

ppalmers

Message:

fix concurrency issue

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (14 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.h (modified) (2 diffs)
• trunk/libffado/tests/dumpiso_mod.cpp (added)
• trunk/libffado/tests/SConscript (modified) (1 diff)
• trunk/libffado/tests/test-timestampedbuffer.cpp (modified) (2 diffs)

trunk/libffado/config.h.in

@@ -39 +39 @@
-#define DEBUG_EXTREME_ENABLE        0
-
-0
+1
-#define IEEE1394SERVICE_CYCLETIMER_DLL_UPDATE_INTERVAL_USEC 200000
-#define IEEE1394SERVICE_MAX_FIREWIRE_PORTS  16

trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

@@ -174 +174 @@
-                           m_last_timestamp, m_syt_interval, getTicksPerFrame());
-    }
+
+    // check whether nevents is a multiple of 8.
+    if (nevents & 0x7) {
+        debugError("Invalid nevents value for AMDTP (%u)\n", nevents);
+    }
-    #endif
-

trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -350 +350 @@
-    packet->syt = ntohs ( timestamp_SYT );
-
+    // FIXME: use a precomputed value here
-    *length = m_syt_interval*sizeof ( quadlet_t ) *m_dimension + 8;
-

trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

@@ -199 +199 @@
-{
-    if (getType() == ePT_Receive) {
-=
+ = 
-    
-        #ifdef DEBUG
@@ -212 +212 @@
-        return (uint64_t)next_period_boundary;
-    } else {
-=
+ = 
-    
-        #ifdef DEBUG
@@ -363 +363 @@
-
-    if (result == eCRV_OK) {
+        #ifdef DEBUG
+        int ticks_per_packet = getTicksPerFrame() * getNominalFramesPerPacket();
+        int diff=diffTicks(m_last_timestamp, m_last_timestamp2);
+        // display message if the difference between two successive tick
+        // values is more than 50 ticks. 1 sample at 48k is 512 ticks
+        // so 50 ticks = 10%, which is a rather large jitter value.
+        if(diff-ticks_per_packet > 50 || diff-ticks_per_packet < -50) {
+            debugOutput(DEBUG_LEVEL_VERBOSE, "rather large TSP difference TS=%011llu => TS=%011llu (%d, nom %d)\n",
+                                             m_last_timestamp2, m_last_timestamp, diff, ticks_per_packet);
+        }
+        #endif
+
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-                          "RECV: CY=%04u TS=%011llu\n",

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -772 +772 @@
-    //       and the receive processors should have done their transfer.
-    m_time_of_transfer = m_SyncSource->getTimeAtPeriod();
+    
+    #ifdef DEBUG
+    static uint64_t m_time_of_transfer2 = m_time_of_transfer;
+    
+    int ticks_per_period = m_SyncSource->getTicksPerFrame() * m_period;
+    int diff=diffTicks(m_time_of_transfer, m_time_of_transfer2);
+    // display message if the difference between two successive tick
+    // values is more than 50 ticks. 1 sample at 48k is 512 ticks
+    // so 50 ticks = 10%, which is a rather large jitter value.
+    if(diff-ticks_per_period > 50 || diff-ticks_per_period < -50) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "rather large TSP difference TS=%011llu => TS=%011llu (%d, nom %d)\n",
+                                            m_time_of_transfer2, m_time_of_transfer, diff, ticks_per_period);
+    }
+    m_time_of_transfer2 = m_time_of_transfer;
+    #endif
+    
-    debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE,
-                        "transfer at %llu ticks...\n",

trunk/libffado/src/libutil/TimestampedBuffer.cpp

@@ -66 +66 @@
-      m_wrap_at(0xFFFFFFFFFFFFFFFFLLU),
-      m_Client(c), m_framecounter(0),
-      m_tick_offset(0.0),
-      m_buffer_tail_timestamp(0.0),
-      m_buffer_next_tail_timestamp(0.0),
@@ -224 +223 @@
-    m_bytes_per_frame=m_event_size*m_events_per_frame;
-    m_bytes_per_buffer=m_bytes_per_frame*m_buffer_size;
-
-    return true;
-}
-
-/**
- * Sets the buffer offset in ticks.
- *
- * A positive value means that the buffer is 'delayed' for nticks ticks.
- *
- * @note These offsets are only used when reading timestamps. Any function
- *       that returns a timestamp will incorporate this offset.
- * @param nframes the number of ticks (positive = delay buffer)
- * @return true if successful
- */
-bool TimestampedBuffer::setTickOffset(ffado_timestamp_t nticks) {
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Setting ticks offset to "TIMESTAMP_FORMAT_SPEC"\n",nticks);
-
-    // JMW: I think we need to update the internal DLL state to take account
-    // of the new offset.  Doing so certainly makes for a smoother MOTU
-    // startup.
-    ENTER_CRITICAL_SECTION;
-    m_buffer_tail_timestamp = m_buffer_tail_timestamp - m_tick_offset + nticks;
-    m_buffer_next_tail_timestamp = (ffado_timestamp_t)((double)m_buffer_tail_timestamp + m_dll_e2);
-    m_tick_offset=nticks;
-    EXIT_CRITICAL_SECTION;
-
-    return true;
@@ -427 +401 @@
-            return false;
-        }
-
+ 
-    }
-    return true;
@@ -752 +726 @@
-    // add the offsets
-    ffado_timestamp_t ts=new_timestamp;
-    ts += m_tick_offset;
-
-    if (ts >= m_wrap_at) {
@@ -842 +815 @@
- */
-void TimestampedBuffer::getBufferHeadTimestamp(ffado_timestamp_t *ts, signed int *fc) {
-
-
+
-    *fc = m_framecounter;
-    *ts = getTimestampFromTail(*fc);
+    EXIT_CRITICAL_SECTION;
-}
-
@@ -859 +832 @@
- */
-void TimestampedBuffer::getBufferTailTimestamp(ffado_timestamp_t *ts, signed int *fc) {
-
-
+
-    *fc = m_framecounter;
-    *ts = getTimestampFromTail(0);
+    EXIT_CRITICAL_SECTION;
-}
-
@@ -903 +876 @@
-ffado_timestamp_t TimestampedBuffer::getTimestampFromHead(int nframes)
-{
-
+
+
+
+
+
-}
-
@@ -939 +916 @@
-void TimestampedBuffer::incrementFrameCounter(unsigned int nbframes, ffado_timestamp_t new_timestamp) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    // the difference between the given TS and the one predicted for this time instant
-    // this is the error for the DLL
-
-
+
+
+
-    // check whether the update is within the allowed bounds
-
+/*
-    ffado_timestamp_t one_update_step = nbframes * getRate();
-
+
+
-    
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
@@ -1012 +942 @@
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-                       " new TS: "TIMESTAMP_FORMAT_SPEC", wrapped new TS: "TIMESTAMP_FORMAT_SPEC"\n", 
-ts
+new_timestamp
-
-    if (diff > max_abs_diff) {
-//         
+        //
-        debugWarning("(%p) difference rather large (+): diff="TIMESTAMP_FORMAT_SPEC", max="TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC"\n",
-ts, pred
+new_timestamp, m
-    } else if (diff < -max_abs_diff) {
-//         
+        //
-        debugWarning("(%p) difference rather large (-): diff="TIMESTAMP_FORMAT_SPEC", max="TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC"\n",
-ts, pred
+new_timestamp, m
-    }
-
@@ -1027 +957 @@
-                       "(%p): diff="TIMESTAMP_FORMAT_SPEC" ",
-                       this, diff);
+#endif
-
-    double err = diff;
@@ -1038 +969 @@
-    ENTER_CRITICAL_SECTION;
-    m_framecounter += nbframes;
-pred
-pred
+m
+m
-    m_dll_e2 += m_dll_c*err;
-
@@ -1065 +996 @@
-        debugError("Wrapping failed for m_buffer_tail_timestamp! "TIMESTAMP_FORMAT_SPEC"\n",m_buffer_tail_timestamp);
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " IN="TIMESTAMP_FORMAT_SPEC", TS="TIMESTAMP_FORMAT_SPEC", NTS="TIMESTAMP_FORMAT_SPEC"\n",
-ts
+new_timestamp
-
-    }
@@ -1071 +1002 @@
-        debugError("Wrapping failed for m_buffer_next_tail_timestamp! "TIMESTAMP_FORMAT_SPEC"\n",m_buffer_next_tail_timestamp);
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " IN="TIMESTAMP_FORMAT_SPEC", TS="TIMESTAMP_FORMAT_SPEC", NTS="TIMESTAMP_FORMAT_SPEC"\n",
-ts
+new_timestamp
-    }
-    
@@ -1077 +1008 @@
-        debugError("Current and next timestamps are equal: "TIMESTAMP_FORMAT_SPEC" "TIMESTAMP_FORMAT_SPEC"\n",
-                   m_buffer_tail_timestamp,m_buffer_next_tail_timestamp);
-    
-    }
-

trunk/libffado/src/libutil/TimestampedBuffer.h

@@ -135 +135 @@
-        ffado_timestamp_t getTimestampFromHead ( int nframes );
-
-        // buffer offset stuff
-        /// return the tick offset value
-        ffado_timestamp_t getTickOffset() {return m_tick_offset;};
-
-        bool setFrameOffset ( int nframes );
-        bool setTickOffset ( ffado_timestamp_t );
-
-        // dll stuff
-        bool setNominalRate ( float r );
@@ -183 +176 @@
-        // the framecounter gives the number of frames in the buffer
-        signed int m_framecounter;
-
-        // the offset that define the timing of the buffer
-        ffado_timestamp_t m_tick_offset;
-
-        // the buffer tail timestamp gives the timestamp of the last frame

trunk/libffado/tests/SConscript

@@ -52 +52 @@
-        "test-streamdump" : "test-streamdump.cpp",
-        "test-bufferops" : "test-bufferops.cpp",
+        "dumpiso_mod" : "dumpiso_mod.cpp"
-}
-

trunk/libffado/tests/test-timestampedbuffer.cpp

@@ -292 +292 @@
-    t->setWrapValue(arguments.wrap_at);
-
-    t->setTickOffset(10000);
-
-    t->prepare();
-
@@ -314 +312 @@
-        // and that setBufferHeadTimestamp doesn't take offset
-        // into account
-+t->getTickOffset()
+
-        if (timestamp2>=arguments.wrap_at) {
-            timestamp2-=arguments.wrap_at;