Changeset 360

Timestamp:

12/30/06 11:49:46 (16 years ago)

Author:

pieterpalmers

Message:

- temporary commit to backup some work

- Started a framework to synchronize IsoHandlers? to

any generic TimeSource?. The idea is to introduce
one overall time reference, and resynchronize all
other timed events to this time source.
This will, on the long run, allow:

• combining devices on multiple FW busses together,
  as these are not synched by hardware.
  
• synchronizing to the system clock
  
• synchronizing to any other time source (e.g.
  when implementing a jackd client, i.e. using
  the freebob devices as jackd clients).
  

- Implemented a realtime safe way to read the cycle

timer for an IsoHandler?. (+ test application)

- Implemented tests/test-sytmonitor:

Monitors 2 or more channels and reports the average
SYT timestamp difference between both.

- Messed around with SYT timestamping for AMDTP. Doesn't

work (yet).

Files:

• trunk/libfreebob/config.h.in (modified) (1 diff)
• trunk/libfreebob/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
• trunk/libfreebob/src/debugmodule/debugmodule.cpp (modified) (2 diffs)
• trunk/libfreebob/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (28 diffs)
• trunk/libfreebob/src/libstreaming/AmdtpStreamProcessor.h (modified) (3 diffs)
• trunk/libfreebob/src/libstreaming/freebob_streaming.cpp (modified) (7 diffs)
• trunk/libfreebob/src/libstreaming/IsoHandler.cpp (modified) (11 diffs)
• trunk/libfreebob/src/libstreaming/IsoHandler.h (modified) (10 diffs)
• trunk/libfreebob/src/libstreaming/IsoHandlerManager.cpp (modified) (3 diffs)
• trunk/libfreebob/src/libstreaming/IsoHandlerManager.h (modified) (3 diffs)
• trunk/libfreebob/src/libstreaming/StreamProcessorManager.cpp (modified) (3 diffs)
• trunk/libfreebob/src/libutil/cycles.h (added)
• trunk/libfreebob/src/libutil/SystemTimeSource.cpp (added)
• trunk/libfreebob/src/libutil/SystemTimeSource.h (added)
• trunk/libfreebob/src/libutil/Time.c (added)
• trunk/libfreebob/src/libutil/Time.h (added)
• trunk/libfreebob/src/libutil/TimeSource.cpp (added)
• trunk/libfreebob/src/libutil/TimeSource.h (added)
• trunk/libfreebob/src/Makefile.am (modified) (5 diffs)
• trunk/libfreebob/support/jack/freebob_driver.c (modified) (2 diffs)
• trunk/libfreebob/tests/Makefile.am (modified) (3 diffs)
• trunk/libfreebob/tests/streaming/test-isohandling.cpp (modified) (1 diff)
• trunk/libfreebob/tests/SytMonitor.cpp (added)
• trunk/libfreebob/tests/SytMonitor.h (added)
• trunk/libfreebob/tests/test-cyclecounter.cpp (added)
• trunk/libfreebob/tests/test-sytmonitor.cpp (added)

trunk/libfreebob/config.h.in

@@ -84 +84 @@
-#undef const
-
- int
+
-#undef size_t
-

trunk/libfreebob/src/bebob/bebob_avdevice.cpp

@@ -110 +110 @@
-    {0x000a92, 0x00010066},  // Presonous FirePOD
-
+    {0x000aac, 0x00000003},  // TerraTec Electronic GmbH, Phase 88 FW 
-    {0x000aac, 0x00000004},  // TerraTec Electronic GmbH, Phase X24 FW (model version 4)
-    {0x000aac, 0x00000007},  // TerraTec Electronic GmbH, Phase X24 FW (model version 7)

trunk/libfreebob/src/debugmodule/debugmodule.cpp

@@ -54 +54 @@
-DebugModule::~DebugModule()
-{
+    cerr << "Unregistering " 
+         << this->getName()
+         << " at DebugModuleManager"
+         << endl;
-    if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
-        cerr << "Could not unregister DebugModule at DebugModuleManager"
@@ -139 +143 @@
-          ++it )
-    {
-
+\n
-        m_debugModules.erase( it );
-        delete *it;

trunk/libfreebob/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -31 +31 @@
-#include "AmdtpPort.h"
-
+#include "cyclecounter.h"
+
-#include <netinet/in.h>
-#include <assert.h>
-
-
-
-
-
-
-
-
-
-
+
+
+
-#define RECEIVE_PROCESSING_DELAY (TICKS_PER_SECOND * 2/1000)
-
+
+
+
+
+
-
-namespace FreebobStreaming {
@@ -54 +54 @@
-/* transmit */
-AmdtpTransmitStreamProcessor::AmdtpTransmitStreamProcessor(int port, int framerate, int dimension)
-
-
+
+
+
-
-
@@ -95 +96 @@
-        struct iec61883_packet *packet = (struct iec61883_packet *) data;
-        unsigned int nevents=0;
-        
-        unsigned long in_time=debugGetCurrentTSC();
-        
-    packet->eoh0 = 0;
@@ -171 +170 @@
-        
-    // FIXME: if m_last_bufferfill > 0
-int ticks_per_frame=syncmaster->getTicksPerFrame()*1024
+float ticks_per_frame=syncmaster->getTicksPerFrame()
-
-    // m_last_timestamp is the moment upon which the last 'period signal'  
@@ -178 +177 @@
-    // not from the moment the signal was actually given)
-    
-nb_buffers * period
+m_ringbuffer_size_frames
-    // be in the buffers. 'right after' the transfer(), all of these 
-    // frames should be in the xmit buffers (if transfer() finishes 
-    // before new packets are received)
-    // therefore the last sample of the xmit buffer lies at 
-
-
+
-    
-    // in reality however life is multithreaded, and we don't know
@@ -192 +190 @@
-    
-    // this means that the current sample has timestamp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    // device to this time to determine the xmit timestamp
-3 + PROCESSING
+2 + TRANSFER
-    
-    // we should determine when to 'queue' this sample to
-    // the ISO xmit layer, based upon the cycle parameter
-    // we can define the ideal time at which to send the sample as
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    
-    // if we take a look at TSEND we can determine if we are to send
@@ -251 +227 @@
-    int cycle_wo_wraparound=cycle;
-    
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  
- < cycle_wo_wraparound*3072
+_cycle_wo_wraparound < cycle_wo_wraparound
-        nevents=m_syt_interval;
-        m_dbc += m_syt_interval;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    } else { // no-data
-  
@@ -286 +271 @@
-                *tag = IEC61883_TAG_WITH_CIP;
-                *sy = 0;
-
-
+
+// 
-//             debugOutput(DEBUG_LEVEL_VERY_VERBOSE, 
-//                 "XMT %04d: CH = %d, FDF = %X. SYT = %6d, DBS = %3d, DBC = %3d, FMT = %3d, LEN = %4d (%2d)\n", 
@@ -297 +282 @@
-//                 *length,
-//                 ((*length / sizeof (quadlet_t)) - 2)/packet->dbs);
-
+// 
-        
-                debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Sending empty packet on cycle %d\n", cycle);
@@ -348 +333 @@
-        }
-        
-        
-        // we can forget the seconds for the cycle counter
-        // because we are masking with 0xFFFF
-
-
-
-
-
-
-
+
+
+
+
+
-        
-//         debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"XMIT %d EVENTS, SYT %04X for cycle %2d: %08d (%2u cycles + %04u ticks)\n",
-
-
-
-
+
+
+
-//           );
-    }
@@ -391 +372 @@
-#endif
-
-    m_PacketStat.mark(debugGetCurrentTSC()-in_time);
-//     m_PacketStat.mark(freebob_ringbuffer_read_space(m_event_buffer)/(4*m_dimension));
-//      debugOutput(DEBUG_LEVEL_VERBOSE, "XMIT took: %d\n",debugGetCurrentTSC()-in_time);
-    return retval;
-
@@ -426 +404 @@
-    //return (m_framecounter > m_period); 
-}
-
+
-bool AmdtpTransmitStreamProcessor::prefill() {
-
+
+
+
+
+
+
+
-    while(i--) {
-        if(!transferSilence(m_period)) {
@@ -438 +422 @@
-    // and we should also provide enough prefill for the
-    // SYT processing delay
-//     if(!transferSilence((m_framerate * RECEIVE_PROCESSING_DELAY)/TICKS_PER_SECOND
-//         debugFatal("Could not prefill transmit stream
-// 
-// 
-
+    if(!transferSilence(RECEIVE_PROCESSING_DELAY_IN_SAMPLES
+        debugFatal("Could not prefill transmit stream (2)
+
+
+*/
-    // the framecounter should be pulled back to
-    // make sure the ISO buffering is used 
@@ -538 +522 @@
-
-    // allocate the event buffer
-unsigned int 
+m_
-    
-    // add the processing delay
-ringbuffer_size_frames+=(m_framerate * RECEIVE_PROCESSING_DELAY)/TICKS_PER_SECOND
+m_ringbuffer_size_frames+=RECEIVE_PROCESSING_DELAY_IN_SAMPLES
-    
-    if( !(m_event_buffer=freebob_ringbuffer_create(
-
+m_
-        debugFatal("Could not allocate memory event ringbuffer");
-//              return -ENOMEM;
@@ -1005 +989 @@
-
-AmdtpReceiveStreamProcessor::AmdtpReceiveStreamProcessor(int port, int framerate, int dimension)
-
+, m_one_period_passed(false)
-
-
@@ -1053 +1037 @@
-        // signal that we're running
-                if(nevents) m_running=true;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if(m_disabled) {
-            return RAW1394_ISO_DEFER;
@@ -1078 +1159 @@
-                retval=RAW1394_ISO_DEFER;
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-
@@ -1223 +1202 @@
-// this uses SYT to determine if one period is ready
-bool AmdtpReceiveStreamProcessor::isOnePeriodReady() { 
-
+
-#ifdef DO_SYT_SYNC
- // this code is not ready yet
@@ -1232 +1211 @@
-    // therefore the number of ticks per sample is 24576000 / Fs
-    // NOTE: this will be rounded!!
-
+
+
-
-    // we are allowed to add some constant 
-    // processing delay to the transfer delay
-    // being the period size and some fixed delay
-
-
+// 
+unsigned int processing_delay=ticks_per_sample*(m_period+RECEIVE_PROCESSING_DELAY_IN_SAMPLES);
-    
-    // the number of events in the buffer is
@@ -1250 +1230 @@
-    // m_last_timestamp - (m_framecounter-m_syt_interval)*ticks_per_sample
-    
-
+
+
+
-    // therefore we first check if this is ok
-    
-
-
+// 
+
-        unsigned int m_last_timestamp_ticks = CYCLE_COUNTER_TO_TICKS(m_last_timestamp);
-        
-        // add the processing delay
-        int ideal_presentation_time = m_last_timestamp_ticks + processing_delay;
-
+
+
-        
-        // if the ideal_presentation_time is smaller than buffer_content_ticks, wraparound has occurred
@@ -1270 +1253 @@
-        // FIXME: if we are sure, make ideal_presentation_time an unsigned int
-//         assert(ideal_presentation_time>=0);
+        
+        unsigned int current_time_ticks = (m_handler->getCycleCounter() % TICKS_PER_SECOND );
+
-#ifdef DEBUG
-        if(ideal_presentation_time<0) {
-            debugWarning("ideal_presentation_time time is negative!\n");
+            debugOutput(DEBUG_LEVEL_VERBOSE,"Periods: %d, FC: %d, remote framerate %f\n",
+                m_PeriodStat.m_count, m_framecounter, m_ticks_per_frame);
+            debugOutput(DEBUG_LEVEL_VERBOSE,"p-delay: %u, buffer_content: %d\n",
+                processing_delay, buffer_content_ticks);
+            debugOutput(DEBUG_LEVEL_VERBOSE,"Timestamp : %10u ticks (%3u secs + %4u cycles + %04u ticks)\n",
+                m_last_timestamp_ticks,
+                CYCLE_COUNTER_GET_SECS(m_last_timestamp), 
+                CYCLE_COUNTER_GET_CYCLES(m_last_timestamp), 
+                CYCLE_COUNTER_GET_OFFSET(m_last_timestamp)
+                );
+            debugOutput(DEBUG_LEVEL_VERBOSE,"P-TIME    : %10d ticks (%3u secs + %4u cycles + %04u ticks)\n",
+                ideal_presentation_time,
+                TICKS_TO_SECS(ideal_presentation_time), 
+                TICKS_TO_CYCLES(ideal_presentation_time),
+                TICKS_TO_OFFSET(ideal_presentation_time)
+                );
+            debugOutput(DEBUG_LEVEL_VERBOSE,"Now       : %10u ticks (%3u secs + %4u cycles + %04u ticks)\n",
+                current_time_ticks, 
+                TICKS_TO_SECS(current_time_ticks), 
+                TICKS_TO_CYCLES(current_time_ticks), 
+                TICKS_TO_OFFSET(current_time_ticks)
+                );
+            return false;
+        }
+        if(ideal_presentation_time<m_last_timestamp_ticks) {
+            debugWarning("ideal_presentation_time earlier than last timestamp!\n");
+            debugOutput(DEBUG_LEVEL_VERBOSE,"Periods: %d, FC: %d, remote framerate %f\n",
+                m_PeriodStat.m_count, m_framecounter, m_ticks_per_frame);
+            debugOutput(DEBUG_LEVEL_VERBOSE,"p-delay: %u, buffer_content: %u\n",
+                processing_delay, buffer_content_ticks);
+            debugOutput(DEBUG_LEVEL_VERBOSE,"Timestamp : %10u ticks (%3u secs + %4u cycles + %04u ticks)\n",
+                m_last_timestamp_ticks,
+                CYCLE_COUNTER_GET_SECS(m_last_timestamp), 
+                CYCLE_COUNTER_GET_CYCLES(m_last_timestamp), 
+                CYCLE_COUNTER_GET_OFFSET(m_last_timestamp)
+                );
+            debugOutput(DEBUG_LEVEL_VERBOSE,"P-TIME    : %10d ticks (%3u secs + %4u cycles + %04u ticks)\n",
+                ideal_presentation_time,
+                TICKS_TO_SECS(ideal_presentation_time), 
+                TICKS_TO_CYCLES(ideal_presentation_time),
+                TICKS_TO_OFFSET(ideal_presentation_time)
+                );
+            debugOutput(DEBUG_LEVEL_VERBOSE,"Now       : %10u ticks (%3u secs + %4u cycles + %04u ticks)\n",
+                current_time_ticks, 
+                TICKS_TO_SECS(current_time_ticks), 
+                TICKS_TO_CYCLES(current_time_ticks), 
+                TICKS_TO_OFFSET(current_time_ticks)
+                );
+                        
-        }
-#endif
-        
-        unsigned int current_time=m_handler->getCycleCounter() & 0x1FFFFFF;
-        unsigned int current_time_ticks = CYCLE_COUNTER_TO_TICKS(current_time);
-
-        // if the last signalled period lies in the future, we know we had wraparound of the clock
-        // so add one second
@@ -1287 +1319 @@
-            CYCLE_COUNTER_GET_SECS(m_last_timestamp), 
-            CYCLE_COUNTER_GET_CYCLES(m_last_timestamp), 
-TICKS
+OFFSET
-            );
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"P-TIME    : %10d ticks (%3u secs + %4u cycles + %04u ticks)\n",
@@ -1297 +1329 @@
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Now       : %10u ticks (%3u secs + %4u cycles + %04u ticks)\n",
-            current_time_ticks, 
-CYCLE_COUNTER_GET_SECS(current_time
-CYCLE_COUNTER_GET_CYCLES(current_time
-CYCLE_COUNTER_GET_TICKS(current_time
+TICKS_TO_SECS(current_time_ticks
+TICKS_TO_CYCLES(current_time_ticks
+TICKS_TO_OFFSET(current_time_ticks
-            );
-        
@@ -1312 +1344 @@
-        if(tmp<0) {
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"SYT passed (%d ticks too late)\n",-tmp);
-
+
+
+
+
-            if (-tmp>1000000) debugWarning("SYT VERY LATE: %d!\n",-tmp);
-            
+            m_WakeupStat.mark(m_framecounter);
+            
+            m_one_period_passed=true;
-            m_last_timestamp_at_period_ticks=ideal_presentation_time;
-
+
+
-        } else {
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Too early wait %d ticks\n",tmp);
-             return false;
-        }
-
-
-
+// 
+// 
+// 
-#else
-    if(m_framecounter > m_period) {
@@ -1331 +1370 @@
-}
-
+unsigned int AmdtpReceiveStreamProcessor::getPeriodTimeStamp() {
+    if (m_one_period_passed) {
+        return m_last_timestamp_at_period_ticks;
+    } else {
+        //     float ticks_per_sample=24576000.0/m_framerate;
+         float ticks_per_sample=m_ticks_per_frame;
+    
+        // we are allowed to add some constant 
+        // processing delay to the transfer delay
+        // being the period size and some fixed delay
+        //     unsigned int processing_delay=ticks_per_sample*(m_period)+RECEIVE_PROCESSING_DELAY;
+        unsigned int processing_delay=ticks_per_sample*(m_period+RECEIVE_PROCESSING_DELAY_IN_SAMPLES);
+        
+        unsigned int m_last_timestamp_ticks = CYCLE_COUNTER_TO_TICKS(m_last_timestamp);
+        
+        // add the processing delay
+        int ideal_presentation_time = m_last_timestamp_ticks + processing_delay;
+        unsigned int buffer_content_ticks=(int)((m_framecounter-m_syt_interval)*ticks_per_sample);
+        
+        // if the ideal_presentation_time is smaller than buffer_content_ticks, wraparound has occurred
+        // for the cycle part of m_last_timestamp. Therefore add one second worth of ticks
+        // to the cycle counter, as this is the wraparound point.
+        if (ideal_presentation_time < buffer_content_ticks) ideal_presentation_time += 24576000;
+        // we can now safely substract these, it will always be > 0
+        ideal_presentation_time -= buffer_content_ticks;
+        
+        return ideal_presentation_time;
+    }
+}
+
-void AmdtpReceiveStreamProcessor::dumpInfo()
-{
@@ -1371 +1440 @@
-        m_last_timestamp2=0;
-        
+        m_one_period_passed=false;
-        
-        // reset all non-device specific stuff
@@ -1429 +1499 @@
-    
-    // add the processing delay
-
-
+
+
+
-    
-    if( !(m_event_buffer=freebob_ringbuffer_create(
-            (m_dimension * ringbuffer_size_frames) * sizeof(quadlet_t)))) {
-                debugFatal("Could not allocate memory event ringbuffer");
-//              return -ENOMEM;
-                return false;
-        }
@@ -1443 +1513 @@
-                debugFatal("Could not allocate temporary cluster buffer");
-                freebob_ringbuffer_free(m_event_buffer);
-//              return -ENOMEM;
-                return false;
-        }

trunk/libfreebob/src/libstreaming/AmdtpStreamProcessor.h

@@ -141 +141 @@
-                                   unsigned int offset, unsigned int nevents);
-
-int
+long
-
-    unsigned int m_dbc;
+    
+    unsigned int m_ringbuffer_size_frames;
-
-    DECLARE_DEBUG_MODULE;
@@ -193 +195 @@
-
-    float getTicksPerFrame() {return m_ticks_per_frame;};
- {return m_last_timestamp_at_period_ticks;}
-
+
+
-    void dumpInfo();
-    
@@ -215 +217 @@
-    float m_ticks_per_frame;
-    
+    bool m_one_period_passed;
+    
-    DECLARE_DEBUG_MODULE;
-

trunk/libfreebob/src/libstreaming/freebob_streaming.cpp

@@ -86 +86 @@
-        if ( !dev->m_deviceManager ) {
-                debugFatal( "Could not allocate device manager\n" );
-       
+
-                return 0;
-        }
@@ -92 +92 @@
-                debugFatal( "Could not initialize device manager\n" );
-                delete dev->m_deviceManager;
-       
+
-                return 0;
-        }
@@ -101 +101 @@
-        if(!dev->processorManager) {
-                debugFatal("Could not create StreamProcessorManager\n");
-       
+
-                delete dev;
-                return 0;
@@ -112 +112 @@
-                debugFatal("Could not init StreamProcessorManager\n");
-                delete dev->processorManager;
-       
+
-                delete dev;
-                return 0;
@@ -120 +120 @@
-        if(!dev->m_deviceManager->discover(DEBUG_LEVEL_NORMAL)) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Could not discover devices\n");
+                delete dev->processorManager;
+        delete dev->m_deviceManager;
+                delete dev;             
-                return 0;
-        }
@@ -131 +134 @@
-                // Set the device's sampling rate to that requested
-                // FIXME: does this really belong here?  If so we need to handle errors.
-
+
+
+
+
+
+
+
+
+
+
-
-                // prepare the device
@@ -156 +168 @@
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Preparing...\n");
-        
-
+
+
+
+
-
-        return true;

trunk/libfreebob/src/libstreaming/IsoHandler.cpp

@@ -29 +29 @@
-#include "IsoHandler.h"
-#include "IsoStream.h"
+#include "cyclecounter.h"
+
+#include "libutil/Time.h"
+#include "libutil/TimeSource.h"
+#include "libutil/SystemTimeSource.h"
+
-#include <errno.h>
-#include <netinet/in.h>
@@ -36 +42 @@
-#include <iostream>
-using namespace std;
+
+
+#define CC_SLEEP_TIME_AFTER_UPDATE     100
+#define CC_SLEEP_TIME_AFTER_FAILURE     10
+#define CC_DLL_COEFF     ((0.01)*((float)(CC_SLEEP_TIME_AFTER_UPDATE/1000.0)))
+
+#define CC_MAX_RATE_ERROR           (2/100.0)
+#define CC_INIT_MAX_TRIES 10
-
-
@@ -79 +93 @@
-
-/* Base class implementation */
+IsoHandler::IsoHandler(int port)
+   : TimeSource(), m_handle(0), m_handle_util(0), m_port(port), 
+   m_buf_packets(400), m_max_packet_size(1024), m_irq_interval(-1),
+   m_cyclecounter_ticks(0), m_lastmeas_usecs(0), m_ticks_per_usec(24.576), 
+   m_ticks_per_usec_dll_err2(0),
+   m_packetcount(0), m_dropped(0), m_Client(0)
+{
+    InitTime();
+    m_TimeSource=new FreebobUtil::SystemTimeSource();
+}
+
+IsoHandler::IsoHandler(int port, unsigned int buf_packets, unsigned int max_packet_size, int irq)
+   : TimeSource(), m_handle(0), m_port(port), 
+   m_buf_packets(buf_packets), m_max_packet_size( max_packet_size), 
+   m_irq_interval(irq), 
+   m_cyclecounter_ticks(0), m_lastmeas_usecs(0), m_ticks_per_usec(24.576),
+   m_ticks_per_usec_dll_err2(0),
+   m_packetcount(0), m_dropped(0), m_Client(0)
+{
+    InitTime();
+    m_TimeSource=new FreebobUtil::SystemTimeSource();
+}
-
-IsoHandler::~IsoHandler() {
@@ -87 +123 @@
-    if(m_handle_util) raw1394_destroy_handle(m_handle_util);
-    
+    delete m_TimeSource;
-}
-
@@ -127 +164 @@
-        raw1394_set_bus_reset_handler(m_handle, busreset_handler);
-
+    // initialize the local timesource
+    m_TimeSource_NbCycleWraps=0;
+    quadlet_t buf=0;
+    unsigned int new_counter;
+    
+    raw1394_read(m_handle_util, raw1394_get_local_id(m_handle_util), 
+        CSR_REGISTER_BASE | CSR_CYCLE_TIME, 4, &buf);
+    
+    new_counter= ntohl(buf) & 0xFFFFFFFF;
+    m_TimeSource_LastSecs=CYCLE_COUNTER_GET_SECS(new_counter);
+
-    // update the cycle counter value for initial value
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -141 +200 @@
-
-/**
-Returns the current value of the cycle count
+Bus reset handl
- *
-the current value of the cycle counter
+?
- */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-unsigned int IsoHandler::getCycleCounter() {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    quadlet_t buf=0;
+    
+    freebob_microsecs_t prev_usecs=m_lastmeas_usecs;
+    unsigned int prev_ticks=m_cyclecounter_ticks;
+    
+    freebob_microsecs_t new_usecs;
+    unsigned int new_ticks;
+    unsigned int new_counter;
+    
+    /* To estimate the cycle counter, we implement a 
+       DLL based routine, that maps the cycle counter
+       on the system clock.
+       
+       For more info, refer to:
+        "Using a DLL to filter time"
+        Fons Adriaensen
+        
+        Can be found at:
+        http://users.skynet.be/solaris/linuxaudio/downloads/usingdll.pdf
+        or maybe at:
+        http://www.kokkinizita.net/linuxaudio
+    
+        Basically what we do is estimate the next point (T1,CC1_est)
+        based upon the previous point (T0, CC0) and the estimated rate (R).
+        Then we compare our estimation with the measured cycle counter
+        at T1 (=CC1_meas). We then calculate the estimation error on R:
+        err=(CC1_meas-CC0)/(T1-T2) - (CC1_est-CC0)/(T1-T2)
+        and try to minimize this on average (DLL)
+        
+        Note that in order to have a contignous mapping, we should
+        update CC0<=CC1_est instead of CC0<=CC1_meas. The measurement 
+        serves only to correct the error 'on average'.
+        
+        In the code, the following variable names are used:
+        T0=prev_usecs
+        T1=next_usecs
+        
+        CC0=prev_ticks
+        CC1_est=est_ticks
+        CC1_meas=meas_ticks
+        
+     */
-    
-    // normally we should be able to use the same handle
@@ -167 +294 @@
-    raw1394_read(m_handle_util, raw1394_get_local_id(m_handle_util), 
-        CSR_REGISTER_BASE | CSR_CYCLE_TIME, 4, &buf);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -189 +495 @@
-        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Handler type    : %s\n",
-             (this->getType()==EHT_Receive ? "Receive" : "Transmit"));
-d, %
+2d, %2
-             m_port, channel);
-d (%d dropped)\n
+10d (%5d dropped)
-             this->getPacketCount(), this->getDroppedCount());
+    #ifdef DEBUG
+    unsigned int cc=this->getCycleCounter();
+        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Cycle counter  : %10lu (%03us, %04ucycles, %04uticks)\n",
+             cc,TICKS_TO_SECS(cc),TICKS_TO_CYCLES(cc),TICKS_TO_OFFSET(cc));
+        #endif
+        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Ticks/usec     : %8.6f (dll2: %8.6e)\n\n",
+             this->getTicksPerUsec(), m_ticks_per_usec_dll_err2);
-
-};
@@ -235 +548 @@
-
-}
+
+/* The timesource interface */
+freebob_microsecs_t IsoHandler::getCurrentTime() {
+    quadlet_t buf=0;
+    unsigned int new_counter;
+    
+    raw1394_read(m_handle_util, raw1394_get_local_id(m_handle_util), 
+        CSR_REGISTER_BASE | CSR_CYCLE_TIME, 4, &buf);
+    
+    new_counter= ntohl(buf) & 0xFFFFFFFF;
+        
+    // this assumes that it never happens that there are more than 2
+    // minutes between calls
+    if (CYCLE_COUNTER_GET_SECS(new_counter) < m_TimeSource_LastSecs) {
+        m_TimeSource_NbCycleWraps++;
+    }
+    
+    freebob_microsecs_t ticks=m_TimeSource_NbCycleWraps * 128 * TICKS_PER_SECOND
+            + CYCLE_COUNTER_TO_TICKS(new_counter);
+    
+    m_TimeSource_LastSecs=CYCLE_COUNTER_GET_SECS(new_counter);
+    
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Wraps=%4u, LastSecs=%3u, nowSecs=%3u, ticks=%10u\n",
+              m_TimeSource_NbCycleWraps, m_TimeSource_LastSecs,
+              CYCLE_COUNTER_GET_SECS(new_counter), ticks
+              );
+              
+    return  ticks;
+}
+
+freebob_microsecs_t IsoHandler::getCurrentTimeAsUsecs() {
+    float tmp=getCurrentTime();
+    float tmp2 = tmp * USECS_PER_TICK;
+    freebob_microsecs_t retval=(freebob_microsecs_t)tmp2;
+    
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"tmp=%f, tmp2=%f, retval=%u\n",
+              tmp, tmp2,retval
+              );
+    
+    return retval;
+}
+
+
-
-/* Child class implementations */
@@ -329 +685 @@
-int IsoRecvHandler::handleBusReset(unsigned int generation) {
-        debugOutput( DEBUG_LEVEL_VERBOSE, "handle bus reset...\n");
+        
-        //TODO: implement busreset
+        
+        // pass on the busreset signal
+        if(IsoHandler::handleBusReset(generation)) {
+                return -1;
+        }
-        return 0;
-}
@@ -439 +801 @@
-        debugOutput( DEBUG_LEVEL_VERBOSE, "bus reset...\n");
-        //TODO: implement busreset
+        
+        // pass on the busreset signal
+        if(IsoHandler::handleBusReset(generation)) {
+                return -1;
+        }
+        
-        return 0;
-}

trunk/libfreebob/src/libstreaming/IsoHandler.h

@@ -31 +31 @@
-#include "../debugmodule/debugmodule.h"
-
+#include "libutil/TimeSource.h"
+
-#include <libraw1394/raw1394.h>
-
@@ -39 +41 @@
-
-class IsoStream;
-
-/*!
-\brief The Base Class for ISO Handlers
@@ -49 +50 @@
-*/
-
-
+ : public FreebobUtil::TimeSource
-{
-        protected:
@@ -60 +61 @@
-                };
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-                virtual ~IsoHandler();
@@ -118 +111 @@
-                // not RT safe
-                // the isohandlermanager is responsible for calling this!
-
-
+
+
+
+
+
+
-        protected:
-            raw1394handle_t m_handle;
@@ -127 +124 @@
-                unsigned int    m_max_packet_size;
-                int             m_irq_interval;
-
-
+
+
+
+
+
+
-                int m_packetcount;
-                int m_dropped;
@@ -134 +135 @@
-                IsoStream *m_Client;
-
-
+
+
+
+
-
-                DECLARE_DEBUG_MODULE;
@@ -141 +145 @@
-                static int busreset_handler(raw1394handle_t handle, unsigned int generation);
-
+        void initCycleCounter();
+
+    // implement the TimeSource interface
+    public:
+        freebob_microsecs_t getCurrentTime();
+        freebob_microsecs_t getCurrentTimeAsUsecs();
+    private:
+        // to cope with wraparound
+        unsigned int m_TimeSource_LastSecs;
+        unsigned int m_TimeSource_NbCycleWraps;
-
-};
@@ -167 +181 @@
-                bool prepare();
-
+        protected:
+                int handleBusReset(unsigned int generation);
+
-        private:
-                int handleBusReset(unsigned int generation);
-
-                static enum raw1394_iso_disposition 
-                iso_receive_handler(raw1394handle_t handle, unsigned char *data, 
@@ -212 +227 @@
-                bool prepare();
-
+    protected:
+        int handleBusReset(unsigned int generation);
+
-        private:
-
-                int handleBusReset(unsigned int generation);
-
-                static enum raw1394_iso_disposition iso_transmit_handler(raw1394handle_t handle,
-                                unsigned char *data, unsigned int *length,

trunk/libfreebob/src/libstreaming/IsoHandlerManager.cpp

@@ -62 +62 @@
-{
-    updateCycleCounters();
+    usleep(USLEEP_AFTER_UPDATE);
+    
-    return true;
-}
@@ -110 +112 @@
-          ++it )
-    {
-
+
+
+
+
-    }
+    
-}
-
@@ -528 +534 @@
-          ++it )
-    {
-Stream
+IsoHandler
-
-                (*it)->dumpInfo();

trunk/libfreebob/src/libstreaming/IsoHandlerManager.h

@@ -36 +36 @@
-
-#include <vector>
+
+#define USLEEP_AFTER_UPDATE_FAILURE 10
+#define USLEEP_AFTER_UPDATE 100
+#define MAX_UPDATE_TRIES 10
-
-namespace FreebobStreaming
@@ -92 +96 @@
-                void enablePolling(IsoStream *); ///< enables polling on a stream
-
-rotected
+ublic
-        
-            
@@ -101 +105 @@
-            // iterate all handlers
-            bool iterate();
-    
+private:
-        // updates the cycle counter caches of all handlers
-        void updateCycleCounters();

trunk/libfreebob/src/libstreaming/StreamProcessorManager.cpp

@@ -151 +151 @@
-
-        // the tread that runs the packet iterators
-
+
+
+
+
-        if(!m_streamingThread) {
-                debugFatal("Could not create streaming thread\n");
@@ -168 +171 @@
-        // the tread that keeps the handler's cycle counters up to date
-        // NOTE: is lower priority nescessary? it can block
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if(!m_isoManagerThread) {
-                debugFatal("Could not create iso manager thread\n");
@@ -218 +234 @@
-                        
-                }
+
+    // if there are no stream processors registered, 
+    // fail
+    if (m_ReceiveProcessors.size() + m_TransmitProcessors.size() == 0) {
+        debugFatal("No stream processors registered, can't do anything usefull\n");
+        return false;
+    }
-
-        return true;

trunk/libfreebob/src/Makefile.am

@@ -24 +24 @@
-
-lib_LTLIBRARIES = libfreebob.la
+
+libfreebob_la_LIBADD = -lrt
+
-noinst_HEADERS =                                        \
-        configrom.h                                     \
@@ -97 +100 @@
-        debugmodule/debugmodule.h                       \
-        debugmodule/debugmodule.cpp                     \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-libfreebob_la_LDFLAGS =                                 \
-        -version-info $(LT_VERSION) $(LIBRAW1394_LIBS)  \
-        $(LIBIEC61883_LIBS) $(LIBAVC1394_LIBS)          \
-
+ -lrt
-
-nobase_dist_pkgdata_DATA =                              \
@@ -141 +152 @@
-        $(LIBIEC61883_LIBS)                             \
-        $(LIBAVC1394_LIBS)                              \
-       
+        
-
-freebob_sync_SOURCES =                                  \
@@ -150 +161 @@
-        $(LIBIEC61883_LIBS)                             \
-        $(LIBAVC1394_LIBS)                              \
-       
+        
-
-
+ bebob_unittests
-
-test_dll_SOURCES = libutil/test-dll.cpp
@@ -160 +171 @@
-test_debugmodule_LDADD = libfreebob.la
-
-noinst_PROGRAMS = bebob_unittests
-
-bebob_unittests_SOURCES = bebob/bebob_unittests.cpp
-bebob_unittests_LDADD   = $(top_builddir)/src/libfreebob.la \
-        $(LIBXMLCPP_LIBS) $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
+

trunk/libfreebob/support/jack/freebob_driver.c

@@ -196 +196 @@
-}
-
-
+ 
-freebob_driver_detach (freebob_driver_t *driver)
-{
@@ -449 +449 @@
-        float delayed_usecs=0.0;
-
- &wait_status,
-                                         
+
+   &wait_status,
-        
-        if ((wait_status < 0)) {

trunk/libfreebob/tests/Makefile.am

@@ -16 +16 @@
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
+# 
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(LIBXML_CFLAGS) \
@@ -22 +22 @@
-
-noinst_PROGRAMS = test-freebob test-extplugcmd test-fw410 freebob-server \
-
+
+
-noinst_HEADERS = 
-
@@ -51 +52 @@
-#TESTS_ENVIRONMENT
-TEST = test-freebob
+
+test_cyclecounter_LDADD = $(top_builddir)/src/libfreebob.la $(LIBIEC61883_LIBS) \
+        $(LIBRAW1394_LIBS) $(LIBAVC1394_LIBS)
+test_cyclecounter_SOURCES = test-cyclecounter.cpp
+
+test_sytmonitor_LDADD = $(top_builddir)/src/libfreebob.la $(LIBIEC61883_LIBS) \
+        $(LIBRAW1394_LIBS) $(LIBAVC1394_LIBS)
+test_sytmonitor_SOURCES = test-sytmonitor.cpp SytMonitor.cpp \
+                          SytMonitor.h

trunk/libfreebob/tests/streaming/test-isohandling.cpp

@@ -27 +27 @@
-
-#include <signal.h>
-
+src/
-
-#include <netinet/in.h>
-
-
-
-
-
-
-
-
+src/libstreaming/
+src/libstreaming/
+src/libstreaming/
+src/libstreaming/
+src/libstreaming/
+src/libutil/
+src/libstreaming/
-
-using namespace FreebobStreaming;