Changeset 784

Timestamp:

12/29/07 03:39:55 (15 years ago)

Author:

ppalmers

Message:

fix shutdown bug

Files:

• trunk/libffado/src/devicemanager.cpp (modified) (2 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/genericavc/avc_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (7 diffs)

trunk/libffado/src/devicemanager.cpp

@@ -89 +89 @@
-DeviceManager::~DeviceManager()
-{
-    delete m_processorManager;
-
-    for ( FFADODeviceVectorIterator it = m_avDevices.begin();
-          it != m_avDevices.end();
@@ -100 +98 @@
-        delete *it;
-    }
+
+    // the SP's are automatically unregistered at the SPM
+    delete m_processorManager;
-
-    for ( FunctorVectorIterator it = m_busreset_functors.begin();

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -57 +57 @@
-                 getConfigRom().getNodeId() );
-    addOption(Util::OptionContainer::Option("snoopMode",false));
+}
+
+AvDevice::~AvDevice()
+{
+    for ( StreamProcessorVectorIterator it = m_receiveProcessors.begin();
+          it != m_receiveProcessors.end();
+          ++it )
+    {
+        delete *it;
+    }
+    for ( StreamProcessorVectorIterator it = m_transmitProcessors.begin();
+          it != m_transmitProcessors.end();
+          ++it )
+    {
+        delete *it;
+    }
-}
-

trunk/libffado/src/genericavc/avc_avdevice.h

@@ -49 +49 @@
-public:
-    AvDevice( DeviceManager& d, std::auto_ptr<ConfigRom>( configRom ));
- {}
-
+
+
-    static bool probe( ConfigRom& configRom );
-    virtual bool discover();
@@ -95 +95 @@
-    // streaming stuff
-    typedef std::vector< Streaming::StreamProcessor * > StreamProcessorVector;
+    typedef std::vector< Streaming::StreamProcessor * >::iterator StreamProcessorVectorIterator;
-    StreamProcessorVector m_receiveProcessors;
-    StreamProcessorVector m_transmitProcessors;

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -56 +56 @@
-{
-    stopHandlers();
+    pruneHandlers();
+    if(m_IsoHandlers.size() > 0) {
+        debugError("Still some handlers in use\n");
+    }
-    if (m_Thread) {
-        m_Thread->Stop();

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -120 +120 @@
-        {
-            if ( *it == processor ) {
+                if (*it == m_SyncSource) {
+                    debugOutput(DEBUG_LEVEL_VERBOSE, "unregistering sync source");
+                    m_SyncSource = NULL;
+                }
-                m_ReceiveProcessors.erase(it);
-                return true;
@@ -132 +136 @@
-        {
-            if ( *it == processor ) {
+                if (*it == m_SyncSource) {
+                    debugOutput(DEBUG_LEVEL_VERBOSE, "unregistering sync source");
+                    m_SyncSource = NULL;
+                }
-                m_TransmitProcessors.erase(it);
-                return true;
@@ -289 +297 @@
-
-bool StreamProcessorManager::syncStartAll() {
+    if(m_SyncSource == NULL) return false;
-    // figure out when to get the SP's running.
-    // the xmit SP's should also know the base timestamp
@@ -434 +443 @@
-StreamProcessorManager::alignReceivedStreams()
-{
+    if(m_SyncSource == NULL) return false;
-    #define ALIGN_AVERAGE_TIME_MSEC 200
-    #define NB_ALIGN_TRIES 40
@@ -659 +669 @@
- */
-bool StreamProcessorManager::waitForPeriod() {
+    if(m_SyncSource == NULL) return false;
-    int time_till_next_period;
-    bool xrun_occurred = false;
-
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "enter...\n");
-
-    assert(m_SyncSource);
-
-    time_till_next_period=m_SyncSource->getTimeUntilNextPeriodSignalUsecs();
@@ -839 +848 @@
- */
-bool StreamProcessorManager::transfer(enum StreamProcessor::eProcessorType t) {
+    if(m_SyncSource == NULL) return false;
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "transfer(%d) at TS=%011llu (%03us %04uc %04ut)...\n", 
-        t, m_time_of_transfer,
@@ -909 +919 @@
- */
-bool StreamProcessorManager::transferSilence(enum StreamProcessor::eProcessorType t) {
+    if(m_SyncSource == NULL) return false;
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "transferSilence(%d) at TS=%011llu (%03us %04uc %04ut)...\n", 
-        t, m_time_of_transfer,