Changeset 309

Timestamp:

09/24/06 17:50:17 (17 years ago)

Author:

jwoithe

Message:

MOTU: Fixed false "missed rx cycle" report following xrun recovery.
Ensure iso rx/tx contexts are deallocated during shutdown/xrun recovery by explicitly deleting IsoHandlers? in IsoHandlerManager::pruneHandlers(). If they aren't deleted here they never get deleted because the reference is lost.
IsoHandler? destructor should only call stop() if the handle is valid.
IsoXmitHandler?'s destructor sets the handle NULL to prevent double-free by the inherited IsoHandler? destructor.
Don't call raw1394_iso_shutdown() from our code. libraw1394 1.2.1 has a bug whereby raw1394_new_handle() fails to initialise the iso_packet_infos field. The bug hits us particularly in IsoRecvHandler::prepare(). It's also not really necessary to call raw1394_iso_shutdown() since raw1394_destroy_handle() will do any cleanups we happen to need.
MOTU: the receive stream no longer falsely complains of buffer problems during device shutdown.
MOTU: fixed a false "missed cycle" detection immediately after the stream was enabled.

Files:

• branches/libfreebob-2.0/src/libstreaming/IsoHandler.cpp (modified) (5 diffs)
• branches/libfreebob-2.0/src/libstreaming/IsoHandler.h (modified) (1 diff)
• branches/libfreebob-2.0/src/libstreaming/IsoHandlerManager.cpp (modified) (2 diffs)
• branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp (modified) (9 diffs)
• branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.h (modified) (2 diffs)
• branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (3 diffs)

branches/libfreebob-2.0/src/libstreaming/IsoHandler.cpp

@@ -81 +81 @@
-
-IsoHandler::~IsoHandler() {
-
-
+
+
+
+
-    if(m_handle_util) raw1394_destroy_handle(m_handle_util);
-    
@@ -228 +230 @@
-IsoRecvHandler::~IsoRecvHandler()
-{
-
+
+
+
+
+
-        raw1394_destroy_handle(m_handle);
-
+
-}
-
@@ -263 +269 @@
-bool IsoRecvHandler::prepare()
-{
-
+
+
+
+
-        
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Preparing iso receive handler (%p)\n",this);
@@ -330 +339 @@
-IsoXmitHandler::~IsoXmitHandler()
-{
-
-
+
+
+
+
+
-        raw1394_destroy_handle(m_handle);
+        m_handle = NULL;
-}
-
@@ -425 +438 @@
-IsoRecvHandler::~IsoRecvHandler()
-{
+// Don't call until libraw1394's raw1394_new_handle() function has been
+// fixed to correctly initialise the iso_packet_infos field.  Bug is
+// confirmed present in libraw1394 1.2.1.  In any case,
+// raw1394_destroy_handle() (in the base class destructor) will do any iso
+// system shutdown required.
-        raw1394_iso_shutdown(m_handle);
-

branches/libfreebob-2.0/src/libstreaming/IsoHandler.h

@@ -112 +112 @@
-                
-                unsigned int getCycleCounter();
-
+
-        protected:
-            raw1394handle_t m_handle;

branches/libfreebob-2.0/src/libstreaming/IsoHandlerManager.cpp

@@ -173 +173 @@
-                }
-        }
-
-        debugFatal("Could not find handler (%p)\n", handler);
-        
@@ -470 +469 @@
-                unregisterHandler(*it);
-                debugOutput( DEBUG_LEVEL_VERBOSE, " deleting handler (%p)\n",*it);
+
+                // Now the handler's been unregistered it won't be reused
+                // again.  Therefore it really needs to be formally deleted
+                // to free up the raw1394 handle.  Otherwise things fall
+                // apart after several xrun recoveries as the system runs
+                // out of resources to support all the disused but still
+                // allocated raw1394 handles.  At least this is the current
+                // theory as to why we end up with "memory allocation"
+                // failures after several Xrun recoveries.
+                delete *it;
-    }
-

branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp

@@ -113 +113 @@
-        }
-
+        // Similarly, initialise the "next cycle".  This can be done
+        // whenever iso data is seen - it doesn't have to wait until
+        // the stream is initialised.
+        if (m_next_cycle < 0)
+                m_next_cycle = cycle;
+
-        // Do housekeeping expected for all packets sent to the MOTU, even
-        // for packets containing no audio data.
@@ -169 +175 @@
-        }
-
-
-
+
-                if (++m_next_cycle >= 8000)
-                        m_next_cycle -= 8000;
@@ -871 +876 @@
-        unsigned int event_size)
-    : ReceiveStreamProcessor(port, framerate), m_event_size(event_size),
-
+, m_closedown_active(0)
-
-        // Set up the Delay-locked-loop to track audio frequency relative
@@ -906 +911 @@
-    // Detect missed receive cycles
-    // FIXME: it would be nice to advance the rx buffer by the amount of
-
-per cycle than the average and "catches up" with period emty
-cycles it's not trivial to work out precisely how many frames
-were missed.  Ultimately we need to do so if sync is to be 
-maintained 
+per
+cycle than the average and "catches up" with periodic empty cycles
+it's not trivial to work out precisely how many frames were missed. 
+Ultimately I think we need to do so if sync is to be maintained
+
-    if (m_next_cycle < 0)
-        m_next_cycle = cycle;
@@ -919 +924 @@
-        have_lost_cycles = 1;
-    }
-
-
+
+
+
+
+
-
-    // If the packet length is 8 bytes (ie: just a CIP-like header) there is
@@ -983 +991 @@
-        }
-
-.
+
-        if (m_disabled) {
-                return RAW1394_ISO_OK;
-        }
-        
+        // If closedown is active we also just throw data way, but in this case
+        // we keep the frame counter going to prevent a false xrun detection
+        if (m_closedown_active) {
+                incrementFrameCounter(n_events);
+                if (m_framecounter > (signed int)m_period)
+                        return RAW1394_ISO_DEFER;
+                return RAW1394_ISO_OK;
+        }
+
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "put packet...\n");
-
@@ -1065 +1082 @@
-                return false;
-        }
+
+        m_next_cycle = -1;
-        
-        return true;
@@ -1185 +1204 @@
-        unsigned int bytes2read = m_period * m_event_size;
-
+        // If closedown is in progress just pretend that data's been transferred
+        // to prevent false underrun detections on the event buffer.
+        if (m_closedown_active)
+                return true;
+
-        /* Read events2read bytes from the ringbuffer.
-        *  First see if it can be done in one read.  If so, ok.
@@ -1406 +1430 @@
-        return m_event_size;
-}
+
+bool MotuReceiveStreamProcessor::preparedForStop() {
+
+        // A MOTU receive stream can stop at any time.  However, signify
+        // that stopping is in progress because other streams (notably the
+        // transmit stream) may keep going for some time and cause an
+        // overflow in the receive buffers.  If a closedown is in progress
+        // the receive handler simply throws all incoming data away so
+        // no buffer overflow can occur.
+        m_closedown_active = 1;
+        return true;
+}
-                
-} // end of namespace FreebobStreaming

branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.h

@@ -164 +164 @@
-        unsigned int getEventSize(void);
-
+        virtual bool preparedForStop();
+
-protected:
-
@@ -187 +189 @@
-        signed int m_next_cycle;
-
+        // Signifies a closedown is in progress, in which case incoming data 
+        // is junked.
+        signed int m_closedown_active;
+
-    DECLARE_DEBUG_MODULE;
-

branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp

@@ -357 +357 @@
-        
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Waiting for all StreamProcessors to start running...\n");
-l
+
-        // i.e. that there is actually some data stream flowing
-        int wait_cycles=2000; // two seconds
@@ -516 +516 @@
-                        }
-                        
-                        
-                }
-
@@ -529 +528 @@
-                        
-                }
-    
-        
-        return true;