Changeset 1348

Timestamp:

09/24/08 09:45:50 (15 years ago)

Author:

ppalmers

Message:

merge 2.0 branch changes to trunk. svn merge -r 1337:HEAD svn+ssh://ffadosvn@ffado.org/ffado/branches/libffado-2.0

Files:

• trunk/libffado/config.h.in (modified) (2 diffs)
• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/CycleTimerHelper.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (4 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (4 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.h (modified) (2 diffs)
• trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.h (modified) (1 diff)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (10 diffs)

trunk/libffado/config.h.in

@@ -64 +64 @@
-#define MAX_XMIT_NB_BUFFERS                                200
-
+// should be PAGE_SIZE (4096) for unpatched kernels
+#define RAW1394_RCV_MIN_BUF_STRIDE                        4096
+
-#define ISOHANDLER_FLUSH_BEFORE_ITERATE                      0
-
@@ -94 +97 @@
-// time to a later time instant also causes the xmit buffer fill to be
-// lower on average.
-
+
+
+
+
+
+
+
+
+
+
-
-// startup control

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -654 +654 @@
-}
-
+uint64_t
+CycleTimerHelper::getSystemTimeForCycleTimerTicks(uint32_t ticks)
+{
+    uint64_t retval;
+    struct compute_vars *my_vars;
+
+    // get pointer and copy the contents
+    // no locking should be needed since we have more than one
+    // of these vars available, and our use will always be finished before
+    // m_current_shadow_idx changes since this thread's priority should
+    // be higher than the one of the writer thread. Even if not, we only have to ensure
+    // that the used dataset is consistent. We can use an older dataset if it's consistent
+    // since it will also provide a fairly decent extrapolation.
+    my_vars = m_shadow_vars + m_current_shadow_idx;
+
+    // the number of ticks the request is ahead of the current CTR position
+    int64_t ticks_diff = diffTicks(ticks, my_vars->ticks);
+    // to how much time does this correspond?
+    double x_step_in_usec = ((double)ticks_diff) / my_vars->rate;
+    int64_t x_step_in_usec_int = (int64_t)x_step_in_usec;
+    retval = my_vars->usecs + x_step_in_usec_int;
+
+    return retval;
+}
+
+uint64_t
+CycleTimerHelper::getSystemTimeForCycleTimer(uint32_t ctr)
+{
+    uint32_t ticks = CYCLE_TIMER_TO_TICKS(ctr);
+    return getSystemTimeForCycleTimerTicks(ticks);
+}
+
-#else
-
@@ -685 +717 @@
-CycleTimerHelper::getCycleTimerTicks(uint64_t now)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -701 +743 @@
-CycleTimerHelper::getCycleTimer(uint64_t now)
-{
+    return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks(now));
+}
+
+uint64_t
+CycleTimerHelper::getSystemTimeForCycleTimerTicks(uint32_t ticks)
+{
-    debugWarning("not implemented!\n");
-
+
+
+
+
+
+
+
+
-}
-

trunk/libffado/src/libieee1394/CycleTimerHelper.h

@@ -98 +98 @@
-    uint32_t getCycleTimer(uint64_t now);
-
+    /**
+     * @brief get the system time for a specific cycle timer value (in ticks)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimerTicks(uint32_t ticks);
+
+    /**
+     * @brief get the system time for a specific cycle timer value (in CTR format)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimer(uint32_t ctr);
+
-    float getRate();
-    float getNominalRate();

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -401 +401 @@
-}
-
+uint64_t
+Ieee1394Service::getSystemTimeForCycleTimerTicks(uint32_t ticks) {
+    return m_pCTRHelper->getSystemTimeForCycleTimerTicks(ticks);
+}
+
+uint64_t
+Ieee1394Service::getSystemTimeForCycleTimer(uint32_t ctr) {
+    return m_pCTRHelper->getSystemTimeForCycleTimer(ctr);
+}
+
-bool
-Ieee1394Service::readCycleTimerReg(uint32_t *cycle_timer, uint64_t *local_time)

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -134 +134 @@
-     */
-    uint32_t getCycleTimer(uint64_t t);
+
+    /**
+     * @brief get the system time for a specific cycle timer value (in ticks)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimerTicks(uint32_t ticks);
+
+    /**
+     * @brief get the system time for a specific cycle timer value (in CTR format)
+     * @note thread safe
+     */
+    uint64_t getSystemTimeForCycleTimer(uint32_t ctr);
-
-    /**

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -475 +475 @@
-    // leave the offset field (for now?)
-
-
+Extreme
-                "received packet: length=%d, channel=%d, cycle=%d, at %08X\n",
-                length, channel, cycle, pkt_ctr);
@@ -566 +566 @@
-        m_last_packet_handled_at = pkt_ctr;
-    }
-
+Extreme
-                "sending packet: length=%d, cycle=%d, at %08X\n",
-                *length, cycle, pkt_ctr);
@@ -670 +670 @@
-    dumpInfo();
-    if (getType() == eHT_Receive) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-        return true;

trunk/libffado/src/libieee1394/IsoHandler.h

@@ -119 +119 @@
-    unsigned int getMaxPacketSize() { return m_max_packet_size;};
-    unsigned int getNbBuffers() { return m_buf_packets;};
-PacketLatency
+IrqInterval
-
-    unsigned int getPreBuffers() {return m_prebuffers;};

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -353 +353 @@
-        #ifdef DEBUG
-        if(m_poll_fds_shadow[i].revents) {
-(DEBUG_LEVEL_ULTRA
+Extreme(DEBUG_LEVEL
-                        "(%p, %s) received events: %08X for (%d/%d, %p, %s)\n",
-                        this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"),
@@ -761 +761 @@
-        // setup the optimal parameters for the raw1394 ISO buffering
-        unsigned int packets_per_period = stream->getPacketsPerPeriod();
-;
- - 2; // for one reason or another this is necessary
+ + 8; // bufferfill takes another 8 bytes for headers
+;
-
-        // Ensure we don't request a packet size bigger than the
-        // kernel-enforced maximum which is currently 1 page.
+        // NOTE: PP: this is not really true AFAICT
-        if (max_packet_size > page_size) {
-            debugError("max packet size (%u) > page size (%u)\n", max_packet_size, page_size);
@@ -771 +772 @@
-        }
-
-
+
+
-        if(irq_interval <= 0) irq_interval=1;
-
+
-        // the receive buffer size doesn't matter for the latency,
-        // but it has a minimal value in order for libraw to operate correctly (300)
@@ -977 +979 @@
-    {
-        if((*it)->isStreamRegistered(stream)) {
-PacketLatency
+IrqInterval
-        }
-    }

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

@@ -34 +34 @@
-#include "libutil/ByteSwap.h"
-#include <assert.h>
+#include "libutil/SystemTimeSource.h"
-
-namespace Streaming {
@@ -66 +67 @@
-}
-
+unsigned int
+AmdtpReceiveStreamProcessor::getAveragePacketSize()
+{
+    // in one second we have 8000 packets
+    // containing FRAMERATE frames of m_dimension quadlets
+    // so 8000 packet headers + FRAMERATE*m_dimension quadlets
+    unsigned int one_second = 8000 * 2 * sizeof(quadlet_t) + m_StreamProcessorManager.getNominalRate() * m_dimension * sizeof(quadlet_t);
+    return one_second / 8000;
+}
+
-bool AmdtpReceiveStreamProcessor::prepareChild() {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Preparing (%p)...\n", this);
@@ -144 +155 @@
-    // later than expected (the real receive time)
-    #ifdef DEBUG
+    static int64_t last_t = Util::SystemTimeSource::getCurrentTime();
+    int64_t now_t = Util::SystemTimeSource::getCurrentTime();
-    if(isRunning()) {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-                           "STMP: %lluticks | syt_interval=%d, tpf=%f\n",
-                           m_last_timestamp, m_syt_interval, getTicksPerFrame());
-
+
+
+
+
+
-
-    // check whether nevents is a multiple of 8.

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

@@ -90 +90 @@
-    virtual unsigned int getMaxPacketSize() 
-                    {return 4 * (2 + getSytInterval() * m_dimension);};
+    virtual unsigned int getAveragePacketSize();
-    virtual unsigned int getEventsPerFrame() 
-                    { return m_dimension; };

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

@@ -406 +406 @@
-    }
-}
+
+unsigned int
+AmdtpTransmitStreamProcessor::getAveragePacketSize()
+{
+    // in one second we have 8000 packets
+    // containing FRAMERATE frames of m_dimension quadlets
+    // so 8000 packet headers + FRAMERATE*m_dimension quadlets
+    unsigned int one_second = 8000 * 2 * sizeof(quadlet_t) + m_StreamProcessorManager.getNominalRate() * m_dimension * sizeof(quadlet_t);
+    return one_second / 8000;
+}
+
-unsigned int
-AmdtpTransmitStreamProcessor::getFDF() {

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

@@ -105 +105 @@
-    virtual unsigned int getMaxPacketSize()
-                    {return 4 * (2 + getSytInterval() * m_dimension);};
+    virtual unsigned int getAveragePacketSize();
-    virtual unsigned int getEventsPerFrame()
-                    { return m_dimension; };

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

@@ -146 +146 @@
-StreamProcessor::getNominalPacketsNeeded(unsigned int nframes)
-{
- 
+
-                    = m_StreamProcessorManager.getNominalRate();
-    uint64_t nominal_ticks_per_frame = TICKS_PER_SECOND / nominal_frames_per_second;
-    uint64_t nominal_ticks = nominal_ticks_per_frame * nframes;
-
+
+
-    return nominal_packets;
-}
@@ -219 +220 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Setting SP %p SyncDelay to %u ticks, %u frames\n", this, d, frames);
-    #endif
-
+
+
+
+
+
+
+
-}
-
@@ -508 +515 @@
-            unsigned int bufferfill = m_data_buffer->getBufferFill();
-            if(bufferfill >= periodsize) {
-
-
-
+
+
+
+
-            }
-            return RAW1394_ISO_OK;
@@ -1509 +1517 @@
-            if (getType() == ePT_Transmit) {
-                ringbuffer_size_frames = m_StreamProcessorManager.getNbBuffers() * m_StreamProcessorManager.getPeriodSize();
+
+                // add sync delay
+                int syncdelay_in_frames = m_StreamProcessorManager.getSyncSource().getSyncDelayFrames();
+                ringbuffer_size_frames += syncdelay_in_frames;
+
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Prefill transmit SP %p with %u frames\n", this, ringbuffer_size_frames);
-                // prefill the buffer

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

@@ -290 +290 @@
-    virtual unsigned int getPacketsPerPeriod();
-    virtual unsigned int getMaxPacketSize() = 0;
+    virtual unsigned int getAveragePacketSize() = 0;
-private:
-    int m_channel;
@@ -376 +377 @@
-         * Returns the sync delay. This is the time a syncsource
-         * delays a period signal, e.g. to cope with buffering.
-
+ (in ticks)
-         */
-        unsigned int getSyncDelay() {return m_sync_delay;};
+        unsigned int getSyncDelayFrames();
-        /**
-         * sets the sync delay

trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

@@ -96 +96 @@
-
-unsigned int
+MotuReceiveStreamProcessor::getAveragePacketSize()
+{
+    // in one second we have 8000 packets
+    // containing FRAMERATE frames
+    // so on average bytes/packet: (8000 packet headers + FRAMERATE * frame_size) / 8000
+    #warning FIXME
+    int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate();
+    return framerate<=48000?616:(framerate<=96000?1032:1160);
+}
+
+unsigned int
-MotuReceiveStreamProcessor::getNominalFramesPerPacket() {
-    int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate();

trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.h

@@ -152 +152 @@
-                {return m_event_size;};
-    virtual unsigned int getMaxPacketSize();
+    virtual unsigned int getAveragePacketSize();
-    virtual unsigned int getEventsPerFrame() 
-                    { return 1; }; // FIXME: check

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

@@ -91 +91 @@
-
-unsigned int
+MotuTransmitStreamProcessor::getAveragePacketSize()
+{
+    // in one second we have 8000 packets
+    // containing FRAMERATE frames
+    // so on average bytes/packet: (8000 packet headers + FRAMERATE * frame_size) / 8000
+    #warning FIXME
+    int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate();
+    return framerate<=48000?616:(framerate<=96000?1032:1160);
+}
+
+unsigned int
-MotuTransmitStreamProcessor::getNominalFramesPerPacket() {
-    int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate();

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.h

@@ -76 +76 @@
-                {return m_event_size;};
-    virtual unsigned int getMaxPacketSize();
+    virtual unsigned int getAveragePacketSize();
-    virtual unsigned int getEventsPerFrame() 
-                    { return 1; }; // FIXME: check

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -462 +462 @@
-    // lower on average.
-    max_of_min_delay += STREAMPROCESSORMANAGER_SIGNAL_DELAY_TICKS;
-
-
-
-
-
+
-    m_SyncSource->setSyncDelay(max_of_min_delay);
+    unsigned int syncdelay = m_SyncSource->getSyncDelay();
+    debugOutput( DEBUG_LEVEL_VERBOSE, " sync delay = %d => %d ticks (%03us %04uc %04ut)...\n", 
+        max_of_min_delay, syncdelay,
+        (unsigned int)TICKS_TO_SECS(syncdelay),
+        (unsigned int)TICKS_TO_CYCLES(syncdelay),
+        (unsigned int)TICKS_TO_OFFSET(syncdelay));
-
-    //STEP X: when we implement such a function, we can wait for a signal from the devices that they
@@ -477 +479 @@
-    // DLL to have a decent sync (FIXME: does the DLL get updated when dry-running)?
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Waiting for sync...\n");
-
+
-    unsigned int nb_sync_runs = (STREAMPROCESSORMANAGER_SYNC_WAIT_TIME_MSEC * getNominalRate());
-    nb_sync_runs /= 1000;
@@ -600 +602 @@
-    float rate = m_SyncSource->getTicksPerFrame();
-    int64_t delay_in_ticks=(int64_t)(((float)((m_nb_buffers-1) * m_period)) * rate);
+    // also add the sync delay
+    delay_in_ticks += m_SyncSource->getSyncDelay();
-    debugOutput( DEBUG_LEVEL_VERBOSE, "  initial time of transfer %010lld, rate %f...\n",
-                m_time_of_transfer, rate);
@@ -930 +934 @@
-    bool xrun_occurred = false;
-    bool in_error = false;
-    bool period_not_ready = true;
-
-    // grab the wait lock
-    // this ensures that bus reset handling doesn't interfere
-    Util::MutexLockHelper lock(*m_WaitLock);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    while(period_not_ready) {
-        debugOutputExtreme(DEBUG_LEVEL_VERBOSE, 
-                           "waiting for period (%d frames in buffer)...\n",
-                           m_SyncSource->getBufferFill());
-
-        // wait for something to happen
-        switch(waitForActivity()) {
-            case eAR_Error:
-                debugError("Error while waiting for activity\n");
-                m_shutdown_needed = true;
-                return false;
-            case eAR_Interrupted:
-                // FIXME: what to do here?
-                debugWarning("Interrupted while waiting for activity\n");
-                break;
-            case eAR_Timeout:
-                debugWarning("Timeout while waiting for activity\n");
-                // ignore this since it can also be due to some other hardware
-                // or high-prio software that preempts us. hence only an xrun should
-                // be generated (if necessary)
-            case eAR_Activity:
-                // do nothing
-                break;
-        }
-        debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "got activity...\n");
-
-        // HACK: this should be solved more elegantly
-        period_not_ready = false;
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
@@ -980 +983 @@
-            }
-        }
-
+
+
+
+
+
-
-        // check for underruns/errors on the ISO side,
@@ -1000 +1007 @@
-        if(xrun_occurred | in_error | m_shutdown_needed) break;
-    }
+    #else
+    // check for underruns/errors on the ISO side,
+    // those should make us bail out of the wait loop
+    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
+        it != m_ReceiveProcessors.end();
+        ++it ) {
+        // xrun on data buffer side
+        if (!(*it)->canConsumePeriod()) {
+            xrun_occurred = true;
+        }
+        // a xrun has occurred on the Iso side
+        xrun_occurred |= (*it)->xrunOccurred();
+        in_error |= (*it)->inError();
+    }
+    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
+        it != m_TransmitProcessors.end();
+        ++it ) {
+        // xrun on data buffer side
+        if (!(*it)->canProducePeriod()) {
+            xrun_occurred = true;
+        }
+        // a xrun has occurred on the Iso side
+        xrun_occurred |= (*it)->xrunOccurred();
+        in_error |= (*it)->inError();
+    }
+    #endif
-
-    if(xrun_occurred) {
@@ -1032 +1065 @@
-    #endif
-
- 
+
-                        "transfer period %d at %llu ticks...\n",
-                        m_nbperiods, m_time_of_transfer);
@@ -1038 +1071 @@
-    // this is to notify the client of the delay that we introduced by waiting
-    m_delayed_usecs = - m_SyncSource->getTimeUntilNextPeriodSignalUsecs();
- DEBUG_LEVEL_VERY
+DEBUG_LEVEL
-                        "delayed for %d usecs...\n",
-                        m_delayed_usecs);
@@ -1146 +1179 @@
-        // the data we are putting into the buffer is intended to be transmitted
-        // one ringbuffer size after it has been received
-
+
+
+
+
+
-
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
@@ -1222 +1259 @@
-        // the data we are putting into the buffer is intended to be transmitted
-        // one ringbuffer size after it has been received
-
+
+
+
+
-
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();