Changeset 740

Timestamp:

11/28/07 14:06:04 (16 years ago)

Author:

ppalmers

Message:

fix propagation of debug/verbose level

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.h (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_functionblock.cpp (modified) (2 diffs)
• trunk/libffado/src/devicemanager.cpp (modified) (3 diffs)
• trunk/libffado/src/libavc/general/avc_plug.cpp (modified) (4 diffs)
• trunk/libffado/src/libavc/general/avc_plug.h (modified) (1 diff)
• trunk/libffado/src/libavc/general/avc_subunit.cpp (modified) (3 diffs)
• trunk/libffado/src/libavc/general/avc_unit.cpp (modified) (4 diffs)
• trunk/libffado/src/libcontrol/Element.cpp (modified) (3 diffs)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -167 +167 @@
-        m_Mixer = new Mixer(*this);
-    }
+    if (m_Mixer) m_Mixer->setVerboseLevel(getDebugLevel());
-    return m_Mixer != NULL;
-}
@@ -183 +184 @@
-    GenericAVC::AvDevice::showDevice();
-    flushDebugOutput();
+}
+
+void
+AvDevice::setVerboseLevel(int l)
+{
+    if (m_Mixer) m_Mixer->setVerboseLevel( l );
+    GenericAVC::AvDevice::setVerboseLevel( l );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-}
-

trunk/libffado/src/bebob/bebob_avdevice.h

@@ -82 +82 @@
-
-    virtual void showDevice();
+    virtual void setVerboseLevel(int l);
-protected:
-    virtual bool propagatePlugInfo();

trunk/libffado/src/bebob/bebob_functionblock.cpp

@@ -170 +170 @@
-    result &= ser.write( basePath + "m_nrOfInputPlugs", m_nrOfInputPlugs );
-    result &= ser.write( basePath + "m_nrOfOutputPlugs", m_nrOfOutputPlugs );
-    result &= ser.write( basePath + "m_verbose", m_verbose );
-    result &= serializePlugVector( basePath + "m_plugs", ser, m_plugs );
-
@@ -226 +225 @@
-    result &= deser.read( basePath + "m_nrOfInputPlugs", pFB->m_nrOfInputPlugs );
-    result &= deser.read( basePath + "m_nrOfOutputPlugs", pFB->m_nrOfOutputPlugs );
-    result &= deser.read( basePath + "m_verbose", pFB->m_verbose );
-    result &= deserializePlugVector( basePath + "m_plugs", deser,
-                                     unit.getPlugManager(), pFB->m_plugs );

trunk/libffado/src/devicemanager.cpp

@@ -319 +319 @@
-                FFADODevice* avDevice = getDriverForDevice( configRom,
-                                                            nodeId );
-
+
-                if ( avDevice ) {
-                    debugOutput( DEBUG_LEVEL_NORMAL,
-                                "driver found for device %d\n",
-                                nodeId );
-
+
-                    avDevice->setVerboseLevel( getDebugLevel() );
-                    bool isFromCache = false;
@@ -330 +330 @@
-                        debugOutput( DEBUG_LEVEL_VERBOSE, "could load from cache\n" );
-                        isFromCache = true;
+                        // restore the debug level for everything that was loaded
+                        avDevice->setVerboseLevel( getDebugLevel() );
-                    } else if ( avDevice->discover() ) {
-                        debugOutput( DEBUG_LEVEL_VERBOSE, "discovering successful\n" );
@@ -337 +339 @@
-                        continue;
-                    }
-
+
-                    if (snoopMode) {
-                        debugOutput( DEBUG_LEVEL_VERBOSE,
-                                    "Enabling snoop mode on node %d...\n", nodeId );
-
+
-                        if(!avDevice->setOption("snoopMode", snoopMode)) {
-                            debugWarning("Could not set snoop mode for device on node %d\n", nodeId);

trunk/libffado/src/libavc/general/avc_plug.cpp

@@ -117 +117 @@
-Plug::setVerboseLevel(int l)
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-    setDebugLevel(l);
+    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Setting verbose level to %d...\n", l );
-}
-
@@ -1595 +1595 @@
-    result &= serializePlugVector( basePath + "m_inputConnections", ser, m_inputConnections );
-    result &= serializePlugVector( basePath + "m_outputConnections", ser, m_outputConnections );
-    result &= ser.write( basePath + "m_verbose_level", getDebugLevel());
-    result &= ser.write( basePath + "m_globalId", m_globalId);
-    result &= ser.write( basePath + "m_globalIdCounter", m_globalIdCounter );
@@ -1638 +1637 @@
-    // input and output connections can't be processed here because not all plugs might
-    // deserialized at this point. so we do that in deserializeUpdate.
-    int level;
-    result &= deser.read( basePath + "m_verbose_level", level );
-    setDebugLevel(level);
-    result &= deser.read( basePath + "m_globalId", pPlug->m_globalId );
-    result &= deser.read( basePath + "m_globalIdCounter", pPlug->m_globalIdCounter );
@@ -1751 +1747 @@
-}
-
+void
+PlugManager::setVerboseLevel( int l )
+{
+    setDebugLevel(l);
+    for ( PlugVector::iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        (*it)->setVerboseLevel(l);
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
+}
+
-bool
-PlugManager::addPlug( Plug& plug )
-{
-    m_plugs.push_back( &plug );
+    // inherit debug level
+    plug.setVerboseLevel(getDebugLevel());
-    return true;
-}

trunk/libffado/src/libavc/general/avc_plug.h

@@ -339 +339 @@
-                                      Util::IODeserialize& deser,
-                                      Unit& avDevice );
-
-
+
-    PlugVector& getPlugs()
-        { return m_plugs; }

trunk/libffado/src/libavc/general/avc_subunit.cpp

@@ -69 +69 @@
-Subunit::setVerboseLevel(int l)
-{
+    setDebugLevel(l);
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-    setDebugLevel(l);
-}
-
@@ -238 +238 @@
-    result  = ser.write( basePath + "m_sbType", m_sbType );
-    result &= ser.write( basePath + "m_sbId", m_sbId );
-    result &= ser.write( basePath + "m_verboseLevel", getDebugLevel() );
-    result &= serializePlugVector( basePath + "m_plugs", ser, m_plugs );
-    result &= serializeChild( basePath, ser );
@@ -283 +282 @@
-    result &= deserializePlugVector( basePath + "m_plugs", deser,
-                                     unit.getPlugManager(), pSubunit->m_plugs );
-    int verboseLevel;
-    result &= deser.read( basePath + "m_verboseLevel", verboseLevel );
-    setDebugLevel(verboseLevel);
-    result &= pSubunit->deserializeChild( basePath, deser, unit );
-

trunk/libffado/src/libavc/general/avc_unit.cpp

@@ -104 +104 @@
-Unit::setVerboseLevel(int l)
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-    setDebugLevel(l);
-    for ( SubunitVector::const_iterator it = m_subunits.begin();
@@ -112 +111 @@
-        (*it)->setVerboseLevel(l);
-    }
-
-    m_pPlugManager->setVerboseLevel(l);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-}
-
@@ -973 +972 @@
-{
-    bool result;
-
-
+
-    result &= serializePlugVector( basePath + "PcrPlug", ser, m_pcrPlugs );
-    result &= serializePlugVector( basePath + "ExternalPlug",  ser, m_externalPlugs );
@@ -1001 +999 @@
-                   Util::IODeserialize& deser )
-{
-
-
-
-
-
+
-
-    result &= deserializeVector<Subunit>( basePath + "Subunit", deser, *this, m_subunits );

trunk/libffado/src/libcontrol/Element.cpp

@@ -63 +63 @@
-Element::setVerboseLevel(int l)
-{
+    setDebugLevel(l);
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-    setDebugLevel(l);
-}
-
@@ -154 +154 @@
-Container::setVerboseLevel(int l)
-{
-debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l 
+setDebugLevel(l
-    for ( ElementVectorIterator it = m_Children.begin();
-      it != m_Children.end();
@@ -161 +161 @@
-        (*it)->setVerboseLevel(l);
-    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-}
-