Changeset 411

Timestamp:

02/21/07 14:25:53 (16 years ago)

Author:

pieterpalmers

Message:

cycletimer.h:
- some extra operations on Ticks (diffTicks & substractTicks)

StreamProcessor?.cpp
AmdtpStreamProcessor?.cpp
MotuStreamProcessor?.cpp:
- Moved the syncDelay to StreamProcessor::getTimeUntilNextPeriodSignalUsecs(). This delay should be the delay between the actual period boundary and the time it is reported to the SPManager. Therefore it's place is not as a buffer offset, but in the calculation of the signalling time.
This makes that the buffer timestamps correspond to 'real' timestamps. These might have to be manipulated by the transmit or receive handles to account for e.g. iso buffering etc..., but at least the timestamps themselves have a well-defined meaning now.

StreamProcessorManager?.cpp:
- The only stream that needs to be running is the sync source stream. It is assumed that the other streams start running in time. 'In time' is currently about 2000 cycles afterwards.

Files:

• branches/streaming-rework/src/libfreebobavc/ieee1394service.cpp (modified) (7 diffs)
• branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (17 diffs)
• branches/streaming-rework/src/libstreaming/cycletimer.h (modified) (6 diffs)
• branches/streaming-rework/src/libstreaming/MotuStreamProcessor.cpp (modified) (7 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.cpp (modified) (2 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.h (modified) (3 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessorManager.cpp (modified) (8 diffs)
• branches/streaming-rework/src/libutil/TimestampedBuffer.cpp (modified) (2 diffs)
• branches/streaming-rework/tests/test-cycletimer.cpp (modified) (1 diff)

branches/streaming-rework/src/libfreebobavc/ieee1394service.cpp

@@ -1 +1 @@
-/* ieee1394service.cpp
- * Copyright (C) 2005,07 by Daniel Wagner
+ * Copyright (C) 2007 by Pieter Palmers
- *
- * This file is part of FreeBoB.
@@ -32 +33 @@
-#include <iomanip>
-
-NORMAL
+VERBOSE
-
-Ieee1394Service::Ieee1394Service()
@@ -379 +380 @@
- */
-signed int Ieee1394Service::allocateIsoChannelGeneric(unsigned int bandwidth) {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Allocating ISO channel using generic method...\n" );
+    
-    struct ChannelInfo cinfo;
-
@@ -433 +436 @@
-    ) {
-
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Allocating ISO channel using IEC61883 CMP...\n" );
+    
-    struct ChannelInfo cinfo;
-    
@@ -482 +487 @@
- */
-bool Ieee1394Service::freeIsoChannel(signed int c) {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Freeing ISO channel %d...\n", c );
-    
-    if (c < 0 || c > 63) {
-
+\n
-        return false;
-    }
@@ -490 +496 @@
-    switch (m_channels[c].alloctype) {
-        default:
-
+ 
-            return false;
-            
-        case AllocFree: 
-
+ 
-            return false;
-            
-        case AllocGeneric:
+            debugOutput(DEBUG_LEVEL_VERBOSE, " allocated using generic routine...\n" );
-            if (unregisterIsoChannel(c)) {
-                return false;
-            } else {
+                debugOutput(DEBUG_LEVEL_VERBOSE, " freeing %d bandwidth units...\n", m_channels[c].bandwidth );
-                if (raw1394_bandwidth_modify(m_handle, m_channels[c].bandwidth, RAW1394_MODIFY_FREE) !=0) {
-                    debugWarning("Failed to deallocate bandwidth\n");
-                }
+                debugOutput(DEBUG_LEVEL_VERBOSE, " freeing channel %d...\n", m_channels[c].channel );
-                if (raw1394_channel_modify (m_handle, m_channels[c].channel, RAW1394_MODIFY_FREE) != 0) {
-                    debugWarning("Failed to free channel\n");
@@ -511 +520 @@
-            
-        case AllocCMP:
+            debugOutput(DEBUG_LEVEL_VERBOSE, " allocated using IEC61883 CMP...\n" );
-            if (unregisterIsoChannel(c)) {
-                return false;
-            } else {
+                debugOutput(DEBUG_LEVEL_VERBOSE, " performing IEC61883 CMP disconnect...\n" );
-                if(iec61883_cmp_disconnect(
-                        m_handle, 

branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -126 +126 @@
-    // the difference between the cycle this
-    // packet is intended for and 'now'
-substract
+diff
-    
-#ifdef DEBUG
@@ -139 +139 @@
-    // to be 'running'
-    // NOTE: this works only at startup
-!= -1
+>= 0
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Xmit StreamProcessor %p started running at cycle %d\n",this, cycle);
-            m_running=true;
@@ -157 +157 @@
-            // the number of cycles the sync source lags (> 0)
-            // or leads (< 0)
-substract
+diff
-            
-            // account for the cycle lag between sync SP and this SP
@@ -167 +167 @@
-            // therefore sync_lag_cycles * TICKS_PER_CYCLE earlier than
-            // T1.
-
-
+
+
+
+
+
+
+
+
-            m_data_buffer->setBufferHeadTimestamp(ts_head);
-
+
-            #ifdef DEBUG
-            if ((unsigned int)m_data_buffer->getFrameCounter() != m_data_buffer->getBufferSize()) {
@@ -176 +182 @@
-            }
-            #endif
-d
+u
-                            ts_head, sync_lag_cycles, m_data_buffer->getFrameCounter());
-        } else {
@@ -202 +208 @@
-    // packet is sent, unless TRANSFER_DELAY > 3072.
-    // this means that we need at least one cycle of extra buffering.
-64
+32
-    
-    // if cycle lies cycle_diff cycles in the future, we should
@@ -210 +216 @@
-
-    // determine the 'now' time in ticks
-
+
+
+
-    
-    // time until the packet is to be sent (if > 0: send packet)
-64_t until_next=substractTicks(ts_head, cycle_timer + ticks_to_advance
+32_t until_next=diffTicks(ts_head, cycle_timer
-
-    // if until_next < 0 we should send a filled packet
@@ -219 +227 @@
-    if((until_next<0) && (m_running)) {
-        // add the transmit transfer delay to construct the playout time (=SYT timestamp)
-64
+32
-    
-        // if we are disabled, send a silent packet
@@ -228 +236 @@
-            m_dbc += fillDataPacketHeader(packet, length, ts_packet);
-            
-l
+
-                cycle, ts_head, ts_packet);
-
@@ -252 +260 @@
-                }
-                
-: CY=%04u TSH=%011llu TSP=%011l
+ DATA: CY=%04u TSH=%011llu TSP=%011
-                    cycle, ts_head, ts_packet);
-                
@@ -282 +290 @@
-        
-    } else { // no packet due, send no-data packet
+        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT NONE: CY=%04u TSH=%011llu\n",
+                cycle, ts_head);
+                
-        m_dbc += fillNoDataPacketHeader(packet, length);
-        return RAW1394_ISO_DEFER;
@@ -356 +367 @@
-    // lies in the future for every possible buffer fill case.
-    int offset=(int)(m_ringbuffer_size_frames*m_ticks_per_frame);
-    
-    // we can substract the delay as it introduces
-    // unnescessary delay
-    offset -= m_SyncSource->getSyncDelay();
-    
-    m_data_buffer->setTickOffset(offset);
@@ -594 +601 @@
-    ts_head=addTicks(ts_head, TRANSMIT_ADVANCE_CYCLES*TICKS_PER_CYCLE);
-    
+    // we want the SP to start sending silent packets somewhat earlier than the
+    // time it is enabled
+    ts_head=substractTicks(ts_head, 100*TICKS_PER_CYCLE);
+    
-    m_data_buffer->setBufferTailTimestamp(ts_head);
-
@@ -888 +899 @@
-    }
-
-
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"ch%2u: CY=%4u, SYT=%08X (%4ucy + %04uticks) (running=%d, disabled=%d,%d)\n",
-        channel, cycle,ntohs(packet->syt),  
@@ -914 +924 @@
-            // because we're going to update the buffer again this loop
-            // using writeframes
-2
+
-
-        } else {
@@ -1037 +1047 @@
-// ISO buffering
-int AmdtpReceiveStreamProcessor::getMinimalSyncDelay() {
-+10000
+
-}
-
@@ -1056 +1066 @@
-    m_PacketStat.reset();
-    m_WakeupStat.reset();
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    // reset all non-device specific stuff

branches/streaming-rework/src/libstreaming/cycletimer.h

@@ -98 +98 @@
-
-/**
+ * @brief Wraps x to the minimum number of ticks
+ *
+ * The input value is wrapped to the minimum value of the cycle
+ * timer, in ticks (= 0).
+ *
+ * @param x time to wrap
+ * @return wrapped time
+ */
+static inline uint32_t wrapAtMinTicks(int64_t x) {
+    if (x < 0) {
+        x += TICKS_PER_SECOND * 128L;
+    }
+
+#ifdef DEBUG
+        if (x < 0) {
+            debugWarning("insufficient wrapping: %lld\n",x);
+            
+            debugWarning("correcting...\n");
+            while (x < 0) {
+                x += TICKS_PER_SECOND * 128L;
+                
+                if (x < 0) {
+                    debugWarning(" insufficient wrapping: %lld\n",x);
+                }
+            }
+        }
+
+#endif
+
+    return (uint32_t)x;
+}
+
+/**
- * @brief Wraps both at minimum and maximum value for ticks
+ *
+ * The input value is wrapped to the maximum value of the cycle
+ * timer, in ticks (128sec * 24576000 ticks/sec), and 
+ * to the minimum value of the cycle timer, in ticks (= 0).
+ *
- * @param x value to wrap
- * @return wrapped value
@@ -137 +175 @@
- * @return the difference x-y, unwrapped
- */
-substract
+diff
-    int64_t diff=(int64_t)x - (int64_t)y;
-    
@@ -165 +203 @@
- *
- * This function computes a sum of timestamps in ticks,
-s
+
- *
- * @param x First timestamp 
@@ -175 +213 @@
-
-    return wrapAtMaxTicks(sum);
+}
+
+/**
+ * @brief Computes a substraction of timestamps
+ *
+ * This function computes a substraction of timestamps in ticks,
+ * wrapping the result if necessary.
+ *
+ * @param x First timestamp 
+ * @param y Second timestamp
+ * @return the difference x-y, wrapped
+ */
+static inline uint32_t substractTicks(uint32_t x, uint32_t y) {
+    int64_t subs=x-y;
+
+    return wrapAtMinTicks(subs);
-}
-
@@ -351 +405 @@
- * such that it respects wrapping (at 8000 cycles).
- *
-substract
+diff
- *
- * @param x First cycle value 
@@ -357 +411 @@
- * @return the difference x-y, unwrapped
- */
-substract
+diff
-    int diff = x - y;
-    

branches/streaming-rework/src/libstreaming/MotuStreamProcessor.cpp

@@ -109 +109 @@
-    // the difference between the cycle this
-    // packet is intended for and 'now'
-substract
+diff
-    
-        // Signal that streaming is still active
@@ -118 +118 @@
-    // to be 'running'
-    // NOTE: this works only at startup
-!= -1
+>= 0
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Xmit StreamProcessor %p started running at cycle %d\n",this, cycle);
-            m_running=true;
@@ -135 +135 @@
-            // the number of cycles the sync source lags (> 0)
-            // or leads (< 0)
-substract
+diff
-            
-            // account for the cycle lag between sync SP and this SP
@@ -199 +199 @@
-    
-    // time until the packet is to be sent (if > 0: send packet)
-64_t until_next=substract
+32_t until_next=diff
-    
-        // Size of a single data frame in quadlets
@@ -370 +370 @@
-    int offset=(int)(m_data_buffer->getBufferSize()*m_ticks_per_frame);
-    
-    // we can substract the delay as it introduces
-    // unnescessary delay
-    offset -= m_SyncSource->getSyncDelay();
-    
-    m_data_buffer->setTickOffset(offset);
-    
@@ -591 +587 @@
-    
-    m_data_buffer->setBufferTailTimestamp(ts_head);
-
-
-    if (!StreamProcessor::prepareForEnable(time_to_enable_at)) {
@@ -1046 +1041 @@
-
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Resetting...\n");
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        // reset all non-device specific stuff

branches/streaming-rework/src/libstreaming/StreamProcessor.cpp

@@ -232 +232 @@
-}
-
-
+Signal
-    uint64_t time_at_period=getTimeAtPeriod();
-    
+    // we delay the period signal with the sync delay
+    // this makes that the period signals lag a little compared to reality
+    // ISO buffering causes the packets to be received at max
+    // m_handler->getWakeupInterval() later than the time they were received.
+    // hence their payload is available this amount of time later. However, the
+    // period boundary is predicted based upon earlier samples, and therefore can
+    // pass before these packets are processed. Adding this extra term makes that
+    // the period boundary is signalled later
+    time_at_period = addTicks(time_at_period, m_SyncSource->getSyncDelay());
+
-    uint64_t cycle_timer=m_handler->getCycleTimerTicks();
-    
-    // calculate the time until the next period
-64_t until_next=substract
+32_t until_next=diff
-    
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> TAP=%11llu, CTR=%11llu, UTN=%11lld\n",
@@ -321 +331 @@
-uint64_t TransmitStreamProcessor::getTimeAtPeriod() {
-    uint64_t next_period_boundary=m_data_buffer->getTimestampFromTail((m_nb_buffers-1) * m_period);
-
+
-    #ifdef DEBUG
-    uint64_t ts,fc;

branches/streaming-rework/src/libstreaming/StreamProcessor.h

@@ -154 +154 @@
-        
-        /**
-
-
-
+should be signaled 
+
+ signal
-         * is the current synchronization source, this function is called to 
-         * determine when a buffer transfer can be made. When this value is
@@ -164 +164 @@
-         * \return the time in usecs
-         */
-
+Signal
-        /**
-         * \brief return the time of the next period boundary (in microseconds)
@@ -181 +181 @@
-         * \brief return the time of the next period boundary (in internal units) 
-         *
-
+Signal
-         *
-         * @return the time in internal units

branches/streaming-rework/src/libstreaming/StreamProcessorManager.cpp

@@ -40 +40 @@
-#define PREPARE_TIMEOUT_MSEC 4000
-#define ENABLE_TIMEOUT_MSEC 4000
+
+#define ENABLE_DELAY_CYCLES 2000
-
-namespace FreebobStreaming {
@@ -259 +261 @@
-bool StreamProcessorManager::syncStartAll() {
-
-all 
+
-    // we have to wait until all streamprocessors indicate that they are running
-    // i.e. that there is actually some data stream flowing
@@ -268 +270 @@
-        notRunning=false;
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        usleep(1000);
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Running check: %d\n",notRunning);
@@ -285 +303 @@
-    if(!wait_cycles) { // timout has occurred
-        debugFatal("One or more streams are not starting up (timeout):\n");
-
+
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-                it != m_ReceiveProcessors.end();
@@ -305 +323 @@
-            }
-        }
-        
-        return false;
-    }
@@ -356 +373 @@
-    
-    // FIXME: this should not be in cycles, but in 'time'
-2000
+ENABLE_DELAY_CYCLES
-    if (enable_at > 8000) enable_at -= 8000;
-
@@ -746 +763 @@
-    assert(m_SyncSource);
-    
-
+Signal
-    
-    while(time_till_next_period > 0) {
@@ -770 +787 @@
-
-        // check if we were waked up too soon
-
+Signal
-    }
-    

branches/streaming-rework/src/libutil/TimestampedBuffer.cpp

@@ -565 +565 @@
-    }
-#endif
-    
-    int64_t diff=m_buffer_next_tail_timestamp - m_buffer_tail_timestamp;
-    if (diff < 0) diff += m_wrap_at;
-
-    pthread_mutex_lock(&m_framecounter_lock);
@@ -605 +602 @@
-    int64_t ts=new_timestamp;
-
-    int64_t diff=m_buffer_next_tail_timestamp - m_buffer_tail_timestamp;
-    if (diff < 0) diff += m_wrap_at;
-    
-    pthread_mutex_lock(&m_framecounter_lock);
-    

branches/streaming-rework/tests/test-cycletimer.cpp

@@ -159 +159 @@
-    
-    int32_t subs;
-substract
+diff
-    if (subs != 2) {
-substract
-
-
-
-
-substract
+diff
+
+
+
+
+diff
-    if (subs != -2) {
-substract
-
-
-
-
-substract
+diff
+
+
+
+
+diff
-    if (subs != 2) {
-substract
-
-
-
-
-substract
+diff
+
+
+
+
+diff
-    if (subs != -2) {
-substract
-
-
-
-
-substract
+diff
+
+
+
+
+diff
-    if (subs != 2) {
-substract
-
-
-
-
-substract
+diff
+
+
+
+
+diff
-    if (subs != -2) {
-substract
+diff
-            subs);
-        failures++;