Changeset 15057 in vbox for trunk/src/VBox/Main/linux

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40443

Message:

Main: load libdbus-1 dynamically on Linux hosts

Location:

trunk/src/VBox/Main/linux

Files:

• HostHardwareLinux.cpp (modified) (8 diffs)
• vbox-dbus.cpp (copied) (copied from trunk/src/VBox/Main/linux/vbox-libhal.cpp ) (3 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)

trunk/src/VBox/Main/linux/vbox-dbus.cpp

@@ -1 +1 @@
 /** @file
  *
- * Module to dynamically load libhal and libdbus and load all symbols
+ * Module to dynamically load libdbus and load all symbols
  * which are needed by VirtualBox.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  */
 
-#include "vbox-libhal.h"
+#include "vbox-dbus.h"
 
 #include <iprt/err.h>
@@ -27 +27 @@
 
 /**
- * Whether we have tried to load libdbus and libhal yet.  This flag should only be set
- * to "true" after we have either loaded both libraries and all symbols which we need,
- * or failed to load something and unloaded and set back to zero pLibDBus and pLibHal.
+ * Whether we have tried to load libdbus-1 yet.  This flag should only be set
+ * to "true" after we have either loaded the library and all symbols which we
+ * need, or failed to load something and unloaded and set back to zero
+ * pLibDBus.
  */
-static bool gCheckedForLibHal = false;
+static bool gCheckedForLibDBus = false;
 /**
- * Pointer to the libhal shared object.  This should only be set once all needed libraries
- * and symbols have been successfully loaded.
+ * Pointer to the libdbus-1 shared object.  This should only be set once all
+ * needed libraries and symbols have been successfully loaded.
  */
-static RTLDRMOD ghLibHal = 0;
+static RTLDRMOD ghLibDBus = NULL;
 
-/** The following are the symbols which we need from libdbus and libhal. */
-void (*gDBusErrorInit)(DBusError *);
-DBusConnection *(*gDBusBusGet)(DBusBusType, DBusError *);
-void (*gDBusErrorFree)(DBusError *);
-void (*gDBusConnectionUnref)(DBusConnection *);
-LibHalContext *(*gLibHalCtxNew)(void);
-dbus_bool_t (*gLibHalCtxSetDBusConnection)(LibHalContext *, DBusConnection *);
-dbus_bool_t (*gLibHalCtxInit)(LibHalContext *, DBusError *);
-char **(*gLibHalFindDeviceStringMatch)(LibHalContext *, const char *, const char *, int *,
-        DBusError *);
-char *(*gLibHalDeviceGetPropertyString)(LibHalContext *, const char *, const char *, DBusError *);
-void (*gLibHalFreeString)(char *);
-void (*gLibHalFreeStringArray)(char **);
-dbus_bool_t (*gLibHalCtxShutdown)(LibHalContext *, DBusError *);
-dbus_bool_t (*gLibHalCtxFree)(LibHalContext *);
+/** The following are the symbols which we need from libdbus. */
+void (*dbus_error_init)(DBusError *);
+DBusConnection *(*dbus_bus_get)(DBusBusType, DBusError *);
+void (*dbus_error_free)(DBusError *);
+void (*dbus_connection_unref)(DBusConnection *);
+void (*dbus_connection_set_exit_on_disconnect)(DBusConnection *, dbus_bool_t);
+dbus_bool_t (*dbus_bus_name_has_owner)(DBusConnection *, const char *,
+                                       DBusError *);
+void (*dbus_bus_add_match)(DBusConnection *, const char *, DBusError *);
+void (*dbus_bus_remove_match)(DBusConnection *, const char *, DBusError *);
+void (*dbus_message_unref)(DBusMessage *);
+DBusMessage* (*dbus_message_new_method_call)(const char *, const char *,
+                                             const char *, const char *);
+void (*dbus_message_iter_init_append)(DBusMessage *, DBusMessageIter *);
+dbus_bool_t (*dbus_message_iter_append_basic)(DBusMessageIter *, int,
+                                              const void *);
+DBusMessage * (*dbus_connection_send_with_reply_and_block)(DBusConnection *,
+                                                           DBusMessage *, int,
+                                                           DBusError *error);
+dbus_bool_t (*dbus_message_iter_init) (DBusMessage *, DBusMessageIter *);
+int (*dbus_message_iter_get_arg_type) (DBusMessageIter *);
+int (*dbus_message_iter_get_element_type) (DBusMessageIter *);
+void (*dbus_message_iter_recurse) (DBusMessageIter *, DBusMessageIter *);
+void (*dbus_message_iter_get_basic) (DBusMessageIter *, void *);
+dbus_bool_t (*dbus_message_iter_next) (DBusMessageIter *);
 
-bool gLibHalCheckPresence(void)
+bool VBoxDBusCheckPresence(void)
 {
-    RTLDRMOD hLibHal;
+    RTLDRMOD hLibDBus;
 
-    if (ghLibHal != 0 && gCheckedForLibHal == true)
+    if (ghLibDBus != 0 && gCheckedForLibDBus == true)
         return true;
-    if (gCheckedForLibHal == true)
+    if (gCheckedForLibDBus == true)
         return false;
-    if (!RT_SUCCESS(RTLdrLoad(LIB_HAL, &hLibHal)))
+    if (   !RT_SUCCESS(RTLdrLoad(LIB_DBUS_1_3, &hLibDBus))
+        && !RT_SUCCESS(RTLdrLoad(LIB_DBUS_1_2, &hLibDBus)))
     {
         return false;
     }
-    if (   RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_error_init", (void **) &gDBusErrorInit))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_bus_get", (void **) &gDBusBusGet))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_error_free", (void **) &gDBusErrorFree))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_connection_unref",
-                                     (void **) &gDBusConnectionUnref))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_ctx_new", (void **) &gLibHalCtxNew))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_ctx_set_dbus_connection",
-                                     (void **) &gLibHalCtxSetDBusConnection))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_ctx_init", (void **) &gLibHalCtxInit))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_manager_find_device_string_match",
-                                     (void **) &gLibHalFindDeviceStringMatch))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_device_get_property_string",
-                                     (void **) &gLibHalDeviceGetPropertyString))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_free_string", (void **) &gLibHalFreeString))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_free_string_array",
-                                     (void **) &gLibHalFreeStringArray))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_ctx_shutdown", (void **) &gLibHalCtxShutdown))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_ctx_free", (void **) &gLibHalCtxFree))
+    if (   RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_error_init",
+                                     (void **) &dbus_error_init))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_get",
+                                     (void **) &dbus_bus_get))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_error_free",
+                                     (void **) &dbus_error_free))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_unref",
+                                     (void **) &dbus_connection_unref))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_set_exit_on_disconnect",
+                                     (void **) &dbus_connection_set_exit_on_disconnect))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_name_has_owner",
+                                     (void **) &dbus_bus_name_has_owner))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_add_match",
+                                     (void **) &dbus_bus_add_match))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_remove_match",
+                                     (void **) &dbus_bus_remove_match))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_unref",
+                                     (void **) &dbus_message_unref))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_new_method_call",
+                                     (void **) &dbus_message_new_method_call))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_init_append",
+                                     (void **) &dbus_message_iter_init_append))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_append_basic",
+                                     (void **) &dbus_message_iter_append_basic))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_send_with_reply_and_block",
+                                     (void **) &dbus_connection_send_with_reply_and_block))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_init",
+                                     (void **) &dbus_message_iter_init))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_get_arg_type",
+                                     (void **) &dbus_message_iter_get_arg_type))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_get_element_type",
+                                     (void **) &dbus_message_iter_get_element_type))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_recurse",
+                                     (void **) &dbus_message_iter_recurse))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_get_basic",
+                                     (void **) &dbus_message_iter_get_basic))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_next",
+                                     (void **) &dbus_message_iter_next))
        )
     {
-        ghLibHal = hLibHal;
-        gCheckedForLibHal = true;
+        ghLibDBus = hLibDBus;
+        gCheckedForLibDBus = true;
         return true;
     }
     else
     {
-        RTLdrClose(hLibHal);
-        gCheckedForLibHal = true;
+        RTLdrClose(hLibDBus);
+        gCheckedForLibDBus = true;
         return false;
     }
 }
+