Changeset 15057 in vbox for trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

Timestamp:

Dec 5, 2008 9:47:30 PM (16 years ago)

Author:

vboxsync

Message:

Main: load libdbus-1 dynamically on Linux hosts

File:

• trunk/src/VBox/Main/linux/HostHardwareLinux.cpp (modified) (8 diffs)

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -49 +49 @@
 # include <linux/cdrom.h>
 # ifdef VBOX_WITH_DBUS
-#  include <dbus/dbus.h>
-/* These are defined by the dbus headers and by VBox header files. */
-#  undef TRUE
-#  undef FALSE
+#  include <vbox-dbus.h>
 # endif
 # include <errno.h>
@@ -77 +74 @@
 #ifdef VBOX_WITH_DBUS
 static int halInit(DBusConnection **ppConnection);
+/* This must be extern to be used in the RTMemAutoPtr template */
+extern void halShutdown (DBusConnection *pConnection);
 static int halFindDeviceStringMatch (DBusConnection *pConnection,
                                      const char *pszKey, const char *pszValue,
@@ -103 +102 @@
 #if defined(RT_OS_LINUX)
 #ifdef VBOX_WITH_DBUS
-        if (RT_SUCCESS (rc) && (!success || testing()))
+        if (RT_SUCCESS (rc) && VBoxDBusCheckPresence() && (!success || testing()))
             rc = getDriveInfoFromHal(&mDVDList, true /* isDVD */, &success);
 #endif /* VBOX_WITH_DBUS defined */
@@ -153 +152 @@
 #if defined(RT_OS_LINUX)
 #ifdef VBOX_WITH_DBUS
-        if (RT_SUCCESS (rc) && (!success || testing()))
+        if (RT_SUCCESS (rc) && VBoxDBusCheckPresence() && (!success || testing()))
             rc = getDriveInfoFromHal(&mFloppyList, false /* isDVD */, &success);
 #endif /* VBOX_WITH_DBUS defined */
@@ -403 +402 @@
     ~autoDBusError ()
     {
-        if (dbus_error_is_set (&mError))
+        if (IsSet())
             dbus_error_free (&mError);
     }
     DBusError &get () { return mError; }
-    bool IsSet () { return dbus_error_is_set (&mError); }
+    bool IsSet ()
+    {
+        Assert ((mError.name == NULL) == (mError.message == NULL));
+        return (mError.name != NULL);
+    }
     bool HasName (const char *pszName)
     {
-        return dbus_error_has_name (&mError, pszName);
+        Assert ((mError.name == NULL) == (mError.message == NULL));
+        return (RTStrCmp (mError.name, pszName) == 0);
     }
     void FlowLog ()
@@ -449 +453 @@
                             "interface='org.freedesktop.Hal.Manager',"
                             "sender='org.freedesktop.Hal',"
-                            "path='/org/freedesktop/Hal/Manager'", &dbusError.get());
+                            "path='/org/freedesktop/Hal/Manager'",
+                            &dbusError.get());
         halSuccess = !dbusError.IsSet();
     }
@@ -458 +463 @@
     dbusError.FlowLog();
     return rc;
+}
+
+/**
+ * Helper function for shutting down a connection to hal
+ * @param   pConnection  the connection handle
+ */
+/* static */
+void halShutdown (DBusConnection *pConnection)
+{
+    AssertReturnVoid(VALID_PTR (pConnection));
+    LogFlowFunc (("pConnection=%p\n", pConnection));
+    autoDBusError dbusError;
+
+    dbus_bus_remove_match (pConnection, 
+                           "type='signal',"
+                           "interface='org.freedesktop.Hal.Manager',"
+                           "sender='org.freedesktop.Hal',"
+                           "path='/org/freedesktop/Hal/Manager'",
+                           &dbusError.get());
+    dbus_connection_unref (pConnection);
+    LogFlowFunc(("returning\n"));
+    dbusError.FlowLog();
 }
 
@@ -624 +651 @@
 
     rc = halInit (&pConnection);
-    RTMemAutoPtr <DBusConnection, dbus_connection_unref> dbusConnection;
+    RTMemAutoPtr <DBusConnection, halShutdown> dbusConnection;
     dbusConnection = pConnection;
     if (!dbusConnection)