Changeset 807

Timestamp:

01/05/08 06:07:23 (14 years ago)

Author:

ppalmers

Message:

more reliability things

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/src/devicemanager.cpp (modified) (1 diff)
• trunk/libffado/src/ffado.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (7 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (7 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (6 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (21 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.h (modified) (3 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (7 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (9 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.h (modified) (3 diffs)
• trunk/libffado/tests/streaming/teststreaming3.cpp (modified) (1 diff)

trunk/libffado/config.h.in

@@ -38 +38 @@
-#define SHAREDIR "$sharedir"
-
-MINIMUM_INTERRUPTS_PER_PERIOD   2U
-MAX_ISO_XMIT_BUFFER_FILL_PCT    50
+IEEE1394SERVICE_USE_CYCLETIMER_DLL  0
+IEEE1394SERVICE_MAX_FIREWIRE_PORTS  16
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define ISOHANDLERMANAGER_MAX_ISO_HANDLERS_PER_PORT         16

trunk/libffado/src/devicemanager.cpp

@@ -560 +560 @@
-        debugWarning("XRUN detected\n");
-        // do xrun recovery
-
-
+
+
+
+
+
+
-    }
-}

trunk/libffado/src/ffado.cpp

@@ -245 +245 @@
-        return dev->options.period_size;
-    } else {
-
+\n
-        xruns++;
-        return -1;

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -21 +21 @@
- *
- */
+
+#include "config.h"
-
-#include "CycleTimerHelper.h"
@@ -47 +49 @@
-    pthread_mutex_unlock(&m_compute_vars_lock); \
-    }
-
-#define OLD_STYLE
-
-IMPL_DEBUG_MODULE( CycleTimerHelper, CycleTimerHelper, DEBUG_LEVEL_NORMAL );
@@ -100 +100 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Start %p...\n", this);
-ndef OLD_STYLE
+ IEEE1394SERVICE_USE_CYCLETIMER_DLL
-    m_Thread = new Util::PosixThread(this, m_realtime, m_priority, 
-                                     PTHREAD_CANCEL_DEFERRED);
@@ -126 +126 @@
-CycleTimerHelper::setThreadParameters(bool rt, int priority) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) switch to: (rt=%d, prio=%d)...\n", this, rt, priority);
-98) priority = 98
+THREAD_MAX_RTPRIO) priority = THREAD_MAX_RTPRIO
-    m_realtime = rt;
-    m_priority = priority;
-
-ndef OLD_STYLE
+ IEEE1394SERVICE_USE_CYCLETIMER_DLL
-    if (m_Thread) {
-        if (m_realtime) {
@@ -139 +139 @@
-    }
-#endif
+
-    return true;
-}
@@ -157 +158 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-bool
@@ -327 +285 @@
-    return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks(now));
-}
+
+#else
+
+bool
+CycleTimerHelper::Execute()
+{
+    usleep(1000*1000);
+    return true;
+}
+uint32_t
+CycleTimerHelper::getCycleTimerTicks()
+{
+    uint32_t cycle_timer;
+    uint64_t local_time;
+    if(!m_Parent.readCycleTimerReg(&cycle_timer, &local_time)) {
+        debugError("Could not read cycle timer register\n");
+        return 0;
+    }
+    return CYCLE_TIMER_TO_TICKS(cycle_timer);
+}
+
+uint32_t
+CycleTimerHelper::getCycleTimerTicks(uint64_t now)
+{
+    return getCycleTimerTicks();
+}
+
+uint32_t
+CycleTimerHelper::getCycleTimer()
+{
+    uint32_t cycle_timer;
+    uint64_t local_time;
+    if(!m_Parent.readCycleTimerReg(&cycle_timer, &local_time)) {
+        debugError("Could not read cycle timer register\n");
+        return 0;
+    }
+    return cycle_timer;
+}
+
+uint32_t
+CycleTimerHelper::getCycleTimer(uint64_t now)
+{
+    return getCycleTimer();
+}
+
-#endif
-

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -23 +23 @@
- */
-
+#include "config.h"
-#include "ieee1394service.h"
-#include "ARMHandler.h"
@@ -42 +43 @@
-#include <iostream>
-#include <iomanip>
-
-#define FFADO_MAX_FIREWIRE_PORTS 16
-
-#define ISOMANAGER_PRIO_INCREASE         11
-#define CYCLETIMER_HELPER_PRIO_INCREASE  10
-
-IMPL_DEBUG_MODULE( Ieee1394Service, Ieee1394Service, DEBUG_LEVEL_NORMAL );
@@ -80 +76 @@
-    , m_realtime ( rt )
-    , m_base_priority ( prio )
-
-
+EEE1394SERVICE_I
+IEEE1394SERVICE_
-    , m_have_new_ctr_read ( false )
-    , m_pTimeSource ( new Util::SystemTimeSource() )
@@ -135 +131 @@
-        return 0;
-    }
-FFADO
-FFADO
+IEEE1394SERVICE
+IEEE1394SERVICE
-    raw1394_destroy_handle(tmp_handle);
-
@@ -215 +211 @@
-        return false;
-    }
-FFADO
-FFADO
+IEEE1394SERVICE
+IEEE1394SERVICE
-    raw1394_destroy_handle(tmp_handle);
-
@@ -224 +220 @@
-    }
-
-FFADO
+IEEE1394SERVICE
-        m_portName = pinf[port].name;
-    } else {
@@ -275 +271 @@
-Ieee1394Service::setThreadParameters(bool rt, int priority) {
-    bool result = true;
-98) priority = 98
+THREAD_MAX_RTPRIO) priority = THREAD_MAX_RTPRIO
-    m_base_priority = priority;
-    m_realtime = rt;
-    if (m_pIsoManager) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Switching IsoManager to (rt=%d, prio=%d)\n",
-
-
+EEE1394SERVICE_I
+EEE1394SERVICE_I
-    }
-    if (m_pCTRHelper) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Switching CycleTimerHelper to (rt=%d, prio=%d)\n", 
-
-
+IEEE1394SERVICE_
+IEEE1394SERVICE_
-    }
-    return result;

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -174 +174 @@
-IsoHandler::waitForClient()
-{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "waiting...\n");
+    if(m_Client) {
+        bool result = m_Client->waitForSignal();
+        debugOutput(DEBUG_LEVEL_VERBOSE, " returns %d\n", result);
+        return result;
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE, " no client\n");
+    }
+    return false;
+}
+
+bool
+IsoHandler::tryWaitForClient()
+{
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "waiting...\n");
-    if(m_Client) {
-waitForFrames
+tryWaitForSignal
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " returns %d\n", result);
-        return result;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-    return false;
@@ -209 +213 @@
-
-    // wait for the availability of frames in the client
-
-
+
+
+
+
+
+
+
-
-#if ISOHANDLER_USE_POLL
@@ -249 +258 @@
-        // iterate blocks if no 1394 data is available
-        // so poll'ing is not really necessary
-
-
+
+
+
+
+
+
+
-        return result;
-#endif
@@ -261 +275 @@
-bool
-IsoHandler::iterate() {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -274 +298 @@
-IsoHandler::setThreadParameters(bool rt, int priority) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) switch to: (rt=%d, prio=%d)...\n", this, rt, priority);
-98) priority = 98
+THREAD_MAX_RTPRIO) priority = THREAD_MAX_RTPRIO
-    m_realtime = rt;
-    m_priority = priority;
@@ -343 +367 @@
-bool IsoHandler::disable()
-{
-
+
+
-
-    // check state

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -68 +68 @@
-IsoHandlerManager::setThreadParameters(bool rt, int priority) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) switch to: (rt=%d, prio=%d)...\n", this, rt, priority);
-98) priority = 98
+THREAD_MAX_RTPRIO) priority = THREAD_MAX_RTPRIO
-    m_realtime = rt;
-    m_priority = priority;
@@ -409 +409 @@
-
-    // set the handler's thread parameters
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        debugFatal("Could not set handler thread parameters\n");
-        return false;

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

@@ -39 +39 @@
-#include <assert.h>
-#include <math.h>
+
+/*
+#define POST_SEMAPHORE { \
+    int tmp; \
+    sem_getvalue(&m_signal_semaphore, &tmp); \
+    debugWarning("posting semaphore from value %d\n", tmp); \
+    sem_post(&m_signal_semaphore); \
+}
+*/
+
+#define POST_SEMAPHORE { \
+    sem_post(&m_signal_semaphore); \
+}
-
-namespace Streaming {
@@ -63 +76 @@
-    , m_sync_delay( 0 )
-    , m_in_xrun( false )
+    , m_signal_period( 0 )
+    , m_signal_offset( 0 )
-{
-    // create the timestamped buffer and register ourselves as its client
@@ -76 +91 @@
-    if (m_data_buffer) delete m_data_buffer;
-    if (m_scratch_buffer) delete[] m_scratch_buffer;
+    sem_destroy(&m_signal_semaphore);
-}
-
@@ -111 +127 @@
-{
-#if ISOHANDLER_PER_HANDLER_THREAD
-
+directly 
-    // the waitForClient in IsoHandler will take care of the fact that the frames are
-    // not present in time
--1
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Nominal prebuffer: %u\n", packets_to_prebuffer);
-    return packets_to_prebuffer;
@@ -286 +302 @@
-            m_dropped += dropped_cycles;
-            m_in_xrun = true;
+            m_last_cycle = cycle;
+            POST_SEMAPHORE;
+            return RAW1394_ISO_DEFER;
-            //flushDebugOutput();
-            //assert(0);
@@ -295 +314 @@
-    if (m_state == ePS_Invalid) {
-        debugError("Should not have state %s\n", ePSToString(m_state) );
+        POST_SEMAPHORE;
-        return RAW1394_ISO_ERROR;
-    }
@@ -316 +336 @@
-            if (!updateState()) { // we are allowed to change the state directly
-                debugError("Could not update state!\n");
+                POST_SEMAPHORE;
-                return RAW1394_ISO_ERROR;
-            }
@@ -334 +355 @@
-            if (!updateState()) { // we are allowed to change the state directly
-                debugError("Could not update state!\n");
+                POST_SEMAPHORE;
-                return RAW1394_ISO_ERROR;
-            }
@@ -364 +386 @@
-                if (!updateState()) { // we are allowed to change the state directly
-                    debugError("Could not update state!\n");
+                    POST_SEMAPHORE;
-                    return RAW1394_ISO_ERROR;
-                }
@@ -381 +404 @@
-            if (!updateState()) { // we are allowed to change the state directly
-                debugError("Could not update state!\n");
+                POST_SEMAPHORE;
-                return RAW1394_ISO_ERROR;
-            }
@@ -400 +424 @@
-                if (!updateState()) { // we are allowed to change the state directly
-                    debugError("Could not update state!\n");
+                    POST_SEMAPHORE;
-                    return RAW1394_ISO_ERROR;
-                }
+                POST_SEMAPHORE;
-                return RAW1394_ISO_DEFER;
-            }
@@ -421 +447 @@
-            if (!updateState()) { // we are allowed to change the state directly
-                debugError("Could not update state!\n");
+                POST_SEMAPHORE;
-                return RAW1394_ISO_ERROR;
-            }
+            POST_SEMAPHORE;
-            return RAW1394_ISO_DEFER;
-        } else if(result2 == eCRV_OK) {
-            // no problem here
+            // if we have enough samples, we can post the semaphore and 
+            // defer further processing until later. this will allow us to
+            // run the client and process the frames such that we can put them
+            // into the xmit buffers ASAP
+            if (m_state == ePS_Running) {
+                unsigned int bufferfill = m_data_buffer->getBufferFill();
+                if(bufferfill >= m_signal_period + m_signal_offset) {
+                    // this to avoid multiple signals for the same period
+                    int semval;
+                    sem_getvalue(&m_signal_semaphore, &semval);
+                    unsigned int signal_period = m_signal_period * (semval + 1) + m_signal_offset;
+                    if(bufferfill >= signal_period) {
+                        debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) buffer fill (%d) > signal period (%d), sem_val=%d\n",
+                                    this, m_data_buffer->getBufferFill(), signal_period, semval);
+                        POST_SEMAPHORE;
+                    }
+                    // the process thread should have higher prio such that we are blocked until
+                    // the samples are processed.
+                }
+            }
-            return RAW1394_ISO_OK;
-        } else {
-            debugError("Invalid response\n");
+            POST_SEMAPHORE;
-            return RAW1394_ISO_ERROR;
-        }
@@ -436 +485 @@
-    } else {
-        debugError("Invalid response\n");
+        POST_SEMAPHORE;
-        return RAW1394_ISO_ERROR;
-    }
-    debugError("reached the unreachable\n");
+    POST_SEMAPHORE;
-    return RAW1394_ISO_ERROR;
-}
@@ -783 +834 @@
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
-    debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, " New timestamp: %llu\n", ts);
+
+    unsigned int bufferfill = m_data_buffer->getBufferFill();
+    if (bufferfill >= m_signal_period + m_signal_offset) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) sufficient frames in buffer (%d / %d), posting semaphore\n",
+                                         this, bufferfill, m_signal_period + m_signal_offset);
+        POST_SEMAPHORE;
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) insufficient frames in buffer (%d / %d), not posting semaphore\n",
+                                         this, bufferfill, m_signal_period + m_signal_offset);
+    }
-    return true; // FIXME: what about failure?
-}
@@ -816 +877 @@
-        return false;
-    }
+
+    unsigned int bufferfill = m_data_buffer->getBufferFill();
+    if (bufferfill >= m_signal_period + m_signal_offset) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) sufficient frames in buffer (%d / %d), posting semaphore\n",
+                                         this, bufferfill, m_signal_period + m_signal_offset);
+        POST_SEMAPHORE;
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) insufficient frames in buffer (%d / %d), not posting semaphore\n",
+                                         this, bufferfill, m_signal_period + m_signal_offset);
+    }
+
-    return true;
-}
-
-bool
-
-
+
+
+
-    if(m_state == ePS_Running) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-        // when we're not running, we can always provide frames
@@ -837 +923 @@
-
-bool
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    } else {
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -942 +1028 @@
-{
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "init...\n");
+
+    if (sem_init(&m_signal_semaphore, 0, 0) == -1) {
+        debugError("Could not init signal semaphore");
+        return false;
+    }
-
-    if(!m_IsoHandlerManager.registerStream(this)) {
@@ -1408 +1499 @@
-            // be picked up by the packet iterator
-
-
+
+
+
+
+
-                debugError("Could not reset data buffer\n");
-                return false;
@@ -1419 +1514 @@
-                    debugFatal("Could not prefill transmit stream\n");
-                    return false;
+                }
+                if (m_data_buffer->getBufferFill() >= m_signal_period + m_signal_offset) {
+                    POST_SEMAPHORE;
-                }
-            }
@@ -1489 +1587 @@
-        case ePS_Running:
-            // the thread will do the transition
+
+            // we have to wake the iterator if it's asleep
+            POST_SEMAPHORE;
-            break;
-        default:
@@ -1691 +1792 @@
-StreamProcessor::dumpInfo()
-{
-:\n", this
+, %s:\n", this, ePTToString(m_processor_type)
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Port, Channel  : %d, %d\n", m_1394service.getPort(), m_channel);
-    uint64_t now = m_1394service.getCycleTimerTicks();

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

@@ -34 +34 @@
-
-#include "debugmodule/debugmodule.h"
+#include <semaphore.h>
-
-class Ieee1394Service;
@@ -157 +158 @@
-    bool putFrames(unsigned int nbframes, int64_t ts); ///< transfer the client contents to the buffer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -460 +489 @@
-    private:
-        bool m_in_xrun;
+        sem_t m_signal_semaphore;
+        unsigned int m_signal_period;
+        unsigned int m_signal_offset;
+
-public:
-    // debug stuff

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -111 +111 @@
-            if ( *it == processor ) {
-                if (*it == m_SyncSource) {
-
+\n
-                    m_SyncSource = NULL;
-                }
@@ -127 +127 @@
-            if ( *it == processor ) {
-                if (*it == m_SyncSource) {
-
+\n
-                    m_SyncSource = NULL;
-                }
@@ -546 +546 @@
-    }
-    // wait for the SP's to get into the dry-running state
-
+0
-    bool ready = false;
-    while (!ready && cnt) {
@@ -565 +565 @@
-    if(cnt==0) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, " Timeout waiting for the SP's to start dry-running\n");
+        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
+            it != m_ReceiveProcessors.end();
+            ++it ) {
+            (*it)->dumpInfo();
+        }
+        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
+            it != m_TransmitProcessors.end();
+            ++it ) {
+            (*it)->dumpInfo();
+        }
-        return false;
-    }
@@ -661 +671 @@
-bool StreamProcessorManager::waitForPeriod() {
-    if(m_SyncSource == NULL) return false;
-    int time_till_next_period;
-    bool xrun_occurred = false;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        // check for underruns on the ISO side,
@@ -689 +707 @@
-        }
-        if(xrun_occurred) break;
-
-
-
+
-    }
-
@@ -701 +717 @@
-    //       and the receive processors should have done their transfer.
-    m_time_of_transfer = m_SyncSource->getTimeAtPeriod();
-Y_VER
+
-        m_time_of_transfer);
-
-    xrun_occurred = false;
-
-#if STREAMPROCESSORMANAGER_DYNAMIC_SYNC_DELAY
-    // normally we can transfer frames at this time, but in some cases this is not true
-    // e.g. when there are not enough frames in the receive buffer.
-    // however this doesn't have to be a problem, since we can wait some more until we
-    // have enough frames. There is only a problem once the ISO xmit doesn't have packets
-    // to transmit, or if the receive buffer overflows. These conditions are signaled by
-    // the iso threads
-    // check if xruns occurred on the Iso side.
-    // also check if xruns will occur should we transfer() now
-    #ifdef DEBUG
-    int waited = 0;
-    #endif
-    
-    bool ready_for_transfer = false;
-    bool ready;
-    while (!ready_for_transfer && !xrun_occurred) {
-        // FIXME: can deadlock when the iso handlers die (e.g. unplug the device)
-        ready_for_transfer = true;
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-            it != m_ReceiveProcessors.end();
-            ++it ) {
-            ready = ((*it)->canClientTransferFrames(m_period));
-            ready_for_transfer &= ready;
-            xrun_occurred |= (*it)->xrunOccurred();
-        }
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-            it != m_TransmitProcessors.end();
-            ++it ) {
-            ready = ((*it)->canClientTransferFrames(m_period));
-            //ready_for_transfer &= ready;
-            xrun_occurred |= (*it)->xrunOccurred();
-        }
-        if(!ready_for_transfer) {
-            debugWarning("xrun_occurred = %d\n", xrun_occurred);
-        }
-        if (!ready_for_transfer) {
-            
-            SleepRelativeUsec(125); // MAGIC: one cycle sleep...
-
-            // in order to avoid this in the future, we increase the sync delay of the sync source SP
-            int d = m_SyncSource->getSyncDelay() + TICKS_PER_CYCLE;
-            m_SyncSource->setSyncDelay(d);
-            d = m_SyncSource->getSyncDelay();
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Increased the Sync delay to: %d ticks (%f frames, %f cy)\n", 
-                                             d, ((float)d)/m_SyncSource->getTicksPerFrame(), 
-                                             ((float)d)/((float)TICKS_PER_CYCLE));
-
-            #ifdef DEBUG
-            waited++;
-            #endif
-        }
-    } // we are either ready or an xrun occurred
-    
-    // in order to avoid a runaway value of the sync delay, we gradually decrease
-    // it. It will be increased by a 'too early' event (cfr some lines higher)
-    // hence we'll be at a good point on average.
-    int d = m_SyncSource->getSyncDelay() - 1;
-    if (d >= 0) m_SyncSource->setSyncDelay(d);
-
-
-    #ifdef DEBUG
-    if(waited > 0) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Waited %d x 125us due to SP not ready for transfer\n", waited);
-    }
-    #endif
-#endif
-
-    // this is to notify the client of the delay that we introduced by waiting

trunk/libffado/src/libutil/TimestampedBuffer.cpp

@@ -52 +52 @@
-    pthread_mutex_unlock(&m_framecounter_lock); \
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-namespace Util {
-
@@ -85 +71 @@
-{
-    pthread_mutex_init(&m_framecounter_lock, NULL);
-
-}
-
@@ -91 +76 @@
-    ffado_ringbuffer_free(m_event_buffer);
-    free(m_cluster_buffer);
-    sem_destroy(&m_frame_semaphore);
-}
-
@@ -281 +265 @@
-
-/**
+ * \brief Returns the current write space in the buffer
+ *
+ * This returns the buffer free space of the internal ringbuffer. This
+ * can only be used as an indication because it's state is not
+ * guaranteed to be consistent at all times due to threading issues.
+ *
+ * @return the internal buffer fill in frames
+ */
+unsigned int TimestampedBuffer::getBufferSpace() {
+    return ffado_ringbuffer_write_space(m_event_buffer)/(m_bytes_per_frame);
+}
+
+/**
- * \brief Initializes the TimestampedBuffer
- *
@@ -289 +286 @@
- */
-bool TimestampedBuffer::init() {
-    if (sem_init(&m_frame_semaphore, 0, 0) == -1) {
-        debugError("Could not init frame semaphore");
-        return false;
-    }
-    return true;
-}
@@ -371 +364 @@
-}
-
-bool
-TimestampedBuffer::waitForFrames(unsigned int nframes)
-{
-    int result;
-    do {
-        unsigned int bufferfill = getBufferFill();
-        if(bufferfill >= nframes) {
-            // first make the semaphore 0
-            while((result=sem_trywait(&m_frame_semaphore)) == 0) {};
-            return true;
-        } else {
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-                        "only %d frames in buffer, waiting for more (%d)\n", 
-                        bufferfill, nframes);
-        }
-    } while((result=sem_wait(&m_frame_semaphore)) == 0);
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-                "sem_wait returns: %d\n",
-                result);
-    return false;
-}
-
-bool
-TimestampedBuffer::tryWaitForFrames(unsigned int nframes)
-{
-    int result;
-    do {
-        unsigned int bufferfill = getBufferFill();
-        if(bufferfill >= nframes) {
-            // first make the semaphore 0
-            while((result=sem_trywait(&m_frame_semaphore)) == 0) {};
-            return true;
-        } else {
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-                        "only %d frames in buffer, waiting for more (%d)\n", 
-                        bufferfill, nframes);
-        }
-    } while((result=sem_trywait(&m_frame_semaphore)) == 0);
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-                "sem_trywait returns: %d\n", 
-                result);
-    return false;
-}
-
-bool
-TimestampedBuffer::waitForFrames()
-{
-    return waitForFrames(m_update_period);
-}
-
-bool
-TimestampedBuffer::tryWaitForFrames()
-{
-    return tryWaitForFrames(m_update_period);
-}
-
-
-/**
- * @brief Insert a dummy frame to the head buffer
@@ -459 +395 @@
-    m_framecounter++;
-    EXIT_CRITICAL_SECTION;
-
-    POST_SEMAPHORE;
-    return true;
-}
@@ -537 +471 @@
-        setBufferTailTimestamp(ts);
-    }
-
-    POST_SEMAPHORE;
-    return true;
-}
@@ -1310 +1242 @@
-    // ts(x) = m_buffer_tail_timestamp +
-    //         (m_buffer_next_tail_timestamp - m_buffer_tail_timestamp)/(samples_between_updates)*x
-    POST_SEMAPHORE;
-}
-

trunk/libffado/src/libutil/TimestampedBuffer.h

@@ -27 +27 @@
-#include "../debugmodule/debugmodule.h"
-#include "libutil/ringbuffer.h"
-#include <semaphore.h>
-
-//typedef float ffado_timestamp_t;
@@ -156 +155 @@
-
-        unsigned int getBufferFill();
+        unsigned int getBufferSpace();
-
-        // timestamp stuff
@@ -244 +244 @@
-        float m_current_rate;
-        unsigned int m_update_period;
-
-        sem_t m_frame_semaphore;
-};
-

trunk/libffado/tests/streaming/teststreaming3.cpp

@@ -292 +292 @@
-
-    dev_options.realtime = (arguments.rtprio != 0);
- + 1
+
-    
-    dev_options.verbose = arguments.verbose;