Changeset 1201

Timestamp:

05/22/08 14:18:19 (16 years ago)

Author:

ppalmers

Message:

fix some deadlock issues on the control code (cfr #114)

Files:

• branches/libffado-2.0/src/debugmodule/debugmodule.cpp (modified) (6 diffs)
• branches/libffado-2.0/src/debugmodule/debugmodule.h (modified) (2 diffs)
• branches/libffado-2.0/src/libcontrol/Element.cpp (modified) (8 diffs)
• branches/libffado-2.0/src/libcontrol/Element.h (modified) (2 diffs)
• branches/libffado-2.0/src/libutil/PosixMutex.cpp (modified) (4 diffs)
• branches/libffado-2.0/support/dbus/controlserver.cpp (modified) (5 diffs)
• branches/libffado-2.0/support/dbus/ffado-dbus-server.cpp (modified) (2 diffs)

branches/libffado-2.0/src/debugmodule/debugmodule.cpp

@@ -32 +32 @@
-
-#include <time.h>
-
+
+
+
+
+
+
+
-
-#if DEBUG_USE_MESSAGE_BUFFER
@@ -288 +294 @@
-        perror("backtrace_symbols");
-    } else {
+        char* outbuf = NULL;
+        size_t length;
+        int status;
+        Dl_info info;
-        for (int j = 0; j < m_backtrace_buffer_nb_seen; j++) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        free(strings);
@@ -646 +670 @@
-
-    for (int j = 0; j < nptrs; j++) {
-
+
+
+
+
-    }
-    chars_written += snprintf(m_backtrace_strbuffer + chars_written, MB_BUFFERSIZE-chars_written, "\n");
@@ -660 +687 @@
-        seen = false;
-        int j;
-
+&
-            if(m_backtrace_buffer_seen[j] == m_backtrace_buffer[i]) {
-                seen = true;
@@ -666 +693 @@
-            }
-        }
-
+
+
-            m_backtrace_buffer_seen[j] = m_backtrace_buffer[i];
-            m_backtrace_buffer_nb_seen++;
-        }
-    }
-
+
-    print(m_backtrace_strbuffer);
-
@@ -689 +717 @@
-    pthread_mutex_lock(&m_backtrace_lock);
-    nptrs = backtrace(m_backtrace_buffer, id+1);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    pthread_mutex_unlock(&m_backtrace_lock);
-
+
-    return retval;
-}
+
+void
+DebugModuleManager::getFunctionName(void *ptr, char *buff, int len)
+{
+    char* outbuf = NULL;
+    size_t length;
+    int status;
+    Dl_info info;
+    if (dladdr(ptr, &info) != 0) {
+        outbuf = abi::__cxa_demangle(info.dli_sname, outbuf, &length, &status);
+        if(outbuf && status == 0) {
+            if(len < (int)length) {
+                strncpy(buff, outbuf, len);
+            } else {
+                strncpy(buff, outbuf, length);
+            }
+        } else {
+            snprintf(buff, len, "%p (%s)", ptr, info.dli_sname);
+        }
+    } else {
+        snprintf(buff, len, "%p (I-ERR)", ptr);
+    }
+    if (outbuf) free(outbuf);
+}
+
-#endif
-

branches/libffado-2.0/src/debugmodule/debugmodule.h

@@ -252 +252 @@
-    #define debugBacktraceGet( _ID_ )                       \
-        DebugModuleManager::instance()->getBacktracePtr( _ID_ );
+    #define debugGetFunctionNameFromAddr( _ADDR_, _BUFF_, _MAX_SIZE_ )              \
+        DebugModuleManager::instance()->getFunctionName( _ADDR_, _BUFF_, _MAX_SIZE_ );
-#else
-    #define debugPrintBacktrace( _SIZE_ )
-    #define debugBacktraceGet( _ID_ )       NULL 
+    #define debugGetFunctionNameFromAddr( _ADDR_, _BUFF_, _MAX_SIZE_ )
-#endif
-
@@ -336 +339 @@
-    void printBacktrace(int len);
-    void *getBacktracePtr(int id);
+    void getFunctionName( void *, char *, int );
-#endif
-

branches/libffado-2.0/src/libcontrol/Element.cpp

@@ -77 +77 @@
-Element::lockControl()
-{
+    if(!m_parent) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Locking tree...\n");
+    }
-    getLock().Lock();
-}
@@ -83 +86 @@
-Element::unlockControl()
-{
+    if(!m_parent) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Unlocking tree...\n");
+    }
-    getLock().Unlock();
-}
@@ -175 +181 @@
-Container::getElementVector()
-{
-
+
+
+
-    return m_Children;
-}
-
-void
-Container::releaseElementVector()
-{
-    unlockControl();
-}
-
@@ -217 +219 @@
-
-bool
-
-
-
+
+
-    if(e == NULL) return false;
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Deleting Element %s from %s\n",
@@ -230 +231 @@
-        if(*it == e) {
-            m_Children.erase(it);
-            // unlock before emitting the signal
-            lock.earlyUnlock();
-            emitSignal(eS_Updated, m_Children.size());
-            return true;
-        }
@@ -242 +240 @@
-
-bool
+Container::deleteElement(Element *e)
+{
+    bool retval;
+    Util::MutexLockHelper lock(getLock());
+    retval = deleteElementNoLock(e);
+    if(retval) {
+        // unlock before emitting the signal
+        lock.earlyUnlock();
+        emitSignal(eS_Updated, m_Children.size());
+    }
+    return retval;
+}
+
+bool
-Container::clearElements(bool delete_pointers) 
-{
@@ -247 +259 @@
-    while(m_Children.size()) {
-        Element *e=m_Children[0];
-
+NoLock
-        if (delete_pointers) delete e;
-    }
@@ -275 +287 @@
-Container::setVerboseLevel(int l)
-{
-    Util::MutexLockHelper lock(getLock());
-    setDebugLevel(l);
-    for ( ElementVectorIterator it = m_Children.begin();

branches/libffado-2.0/src/libcontrol/Element.h

@@ -150 +150 @@
-
-    /**
-and locks the element vector. No changes will be made to the vector
-until releaseElementVector is called
+the element vector. be sure to lock the tree while using
+the return value
-     * @return 
-     */
-    const ElementVector & getElementVector();
-
-    /**
-     * Releases the lock on the element vector.
-     */
-    void releaseElementVector();
-
-    virtual void show();
@@ -167 +162 @@
-        eS_Updated,
-    };
+
+private:
+    bool deleteElementNoLock(Element *e);
-
-protected:

branches/libffado-2.0/src/libutil/PosixMutex.cpp

@@ -33 +33 @@
-// check whether backtracing is enabled
-#if DEBUG_LOCK_COLLISION_TRACING
+    #define DEBUG_LOCK_COLLISION_TRACING_INDEX 2
+    #define DEBUG_LOCK_COLLISION_TRACING_NAME_MAXLEN 64
-    #if DEBUG_BACKTRACE_SUPPORT
-    // ok
@@ -70 +72 @@
-PosixMutex::Lock()
-{
+    int err;
-    debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) lock\n", this);
-    #if DEBUG_LOCK_COLLISION_TRACING
-    if(TryLock()) {
-        // locking succeeded
-
+
+
+
+
+
+
-        debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE,
-p has
-m_locked_by
+s obtained
+name
-        return;
-    } else {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    #else
-    pthread_mutex_lock(&m_mutex);
+    #endif
-    #endif
-}
@@ -121 +160 @@
-    // unlocking
-    m_locked_by = NULL;
-
+
+
+
+
-    debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE,
-p
-unlocker
+s
+name
-    #endif
-
+    #ifdef DEBUG
+    int err;
+    if((err = pthread_mutex_unlock(&m_mutex))) {
+        debugError("Error unlocking the mutex: %d\n", err);
+    }
+    #else
-    pthread_mutex_unlock(&m_mutex);
+    #endif
-}
-
@@ -133 +182 @@
-PosixMutex::show()
-{
-\n", this
+ (%s)\n", this, (isLocked() ? "Locked" : "Unlocked")
-}
-

branches/libffado-2.0/support/dbus/controlserver.cpp

@@ -184 +184 @@
-    int nbElements=m_Slave.countElements();
-    if (i<nbElements) {
+        m_Slave.lockControl();
-        const Control::ElementVector elements = m_Slave.getElementVector();
-        Control::Element *e = elements.at(i);
-        std::string name;
-        if(e) name = e->getName();
-releaseElementVector
+unlockControl
-        return name;
-    } else return "";
@@ -194 +195 @@
-//     Util::MutexLockHelper lock(*m_access_lock);
-
-access lock held!
+tree locked
-void
-Container::updateTree()
@@ -263 +264 @@
-        to_remove.erase(to_remove.begin());
-    }
-    m_Slave.releaseElementVector();
-
-    if(something_changed) {
@@ -279 +279 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, 
-                "removing handler %p on path %s\n",
-path().c_str(), e
+e, path().c_str()
-    for ( ElementVectorIterator it = m_Children.begin();
-      it != m_Children.end();
@@ -313 +313 @@
-    // we lock the tree first
-    Lock();
+
+    // also lock the slave tree
+    m_Slave.lockControl();
+
-    // update our tree
-    updateTree();
+
+    // now unlock the slave tree
+    m_Slave.unlockControl();
+
+    // and unlock the access
-    Unlock();
-}

branches/libffado-2.0/support/dbus/ffado-dbus-server.cpp

@@ -300 +300 @@
-        conn.request_name("org.ffado.Control");
-
+        // lock the control tree such that it does not get modified while we build our view
+        m_deviceManager->lockControl();
-        container = new DBusControl::Container(conn, "/org/ffado/Control/DeviceManager", 
-                                               NULL, *m_deviceManager);
-
+
+
+
-        printMessage("DBUS test service running\n");
-        printMessage("press ctrl-c to stop it & exit\n");
@@ -309 +313 @@
-            debugOutput( DEBUG_LEVEL_NORMAL, "dispatching...\n");
-            dispatcher.enter();
+
-            debugOutput( DEBUG_LEVEL_NORMAL, " dispatcher exited...\n");
-            sem_wait(&run_sem);