File ivman-0.6.13-dbus_hal.patch of Package ivman

Overview Repositories Revisions Requests Users Attributes Meta

File ivman-0.6.13-dbus_hal.patch of Package ivman (Revision 150be9b3d2bb7dc1927793623c1be4ea)

Currently displaying revision 150be9b3d2bb7dc1927793623c1be4ea , Show latest

Index: ivman-0.6.13/src/dbus_interface.c
===================================================================
--- ivman-0.6.13.orig/src/dbus_interface.c
+++ ivman-0.6.13/src/dbus_interface.c
@@ -14,16 +14,166 @@
  * $Id: dbus_interface.c,v 1.7 2006/12/02 00:30:15 ro_han Exp $
  *****************************************************************************/
 
-#include <dbus/dbus.h>
 #include <stdlib.h>
+#include <string.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
 
 #include "dbus_interface.h"
+#include "hal_interface.h"
+#include "log.h"
 #include "common.h"
 
-void ivm_check_dbus_error(const DBusError * error)
+char *ivm_dbus_get_name_owner(const char *name)
+{
+	DBusMessage *	message;
+	DBusMessage *	reply;
+	char *		owner = NULL;
+
+	g_return_val_if_fail (name != NULL, NULL);
+
+	if (dbus_connection == NULL)
+		return NULL;
+
+	if ((message = dbus_message_new_method_call(DBUS_SERVICE_DBUS,
+						    DBUS_PATH_DBUS,
+						    DBUS_INTERFACE_DBUS, "GetNameOwner")))
+	{
+		dbus_message_append_args (message, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
+		if ((reply = dbus_connection_send_with_reply_and_block (dbus_connection, message, -1, NULL)))
+		{
+			DBusError error;
+			const char *tmp_name = NULL;
+
+			dbus_error_init(&error);
+			if (dbus_message_get_args(reply,
+						  &error,
+						  DBUS_TYPE_STRING, &tmp_name,
+						  DBUS_TYPE_INVALID)) {
+				if (dbus_error_is_set(&error)) {
+					log_error("dbus error: %s", error.message);
+					return NULL;
+				}
+				owner = g_strdup(tmp_name);
+			}
+			dbus_message_unref(reply);
+		}
+		dbus_message_unref(message);
+	}
+
+	return owner;
+}
+
+void ivm_check_dbus_error(DBusError * error)
 {
     if (dbus_error_is_set(error)) {
         DEBUG(_("DBus Error! %s: %s"), error->name, error->message);
 	dbus_error_free(error);
     }
 }
+
+void ivm_dbus_init(void)
+{
+	DBusError error;
+
+	dbus_error_init(&error);
+	dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
+	if ((dbus_connection == NULL) || dbus_error_is_set(&error))
+	{
+		log_error("Could not get the system bus.  Make sure dbus is running!");
+		return;
+	}
+
+	dbus_connection_set_exit_on_disconnect(dbus_connection, FALSE);
+	dbus_connection_setup_with_g_main(dbus_connection, NULL);
+
+	if (!dbus_connection_add_filter(dbus_connection, ivm_dbus_signal_filter, NULL, NULL))
+	{
+		log_error("could not attach a dbus message filter.");
+		dbus_connection = NULL;
+		return;
+	}
+
+	dbus_bus_add_match(dbus_connection,
+			   "type='signal',"
+			   "interface='" DBUS_INTERFACE_DBUS "',"
+			   "sender='" DBUS_SERVICE_DBUS "'",
+			   &error);
+	if (dbus_error_is_set(&error))
+		log_error("dbus error: %s", error.message);
+
+	DEBUG("Connected to dbus");
+}
+
+void *ivm_dbus_reinit(void)
+{
+	do {
+		ivm_dbus_init();
+		g_usleep (G_USEC_PER_SEC * 3);
+	} while (dbus_connection == NULL);
+
+	/* if HAL was quick it is already back on the bus. Thus, we do not receive NameOwnerChanged */
+	if (ivm_dbus_get_name_owner("org.freedesktop.Hal"))
+		hal_init();
+
+	return NULL;
+}
+
+DBusHandlerResult ivm_dbus_signal_filter(DBusConnection *connection, DBusMessage *message, void *user_data)
+{
+	DBusError error;
+	gboolean handled = FALSE;
+
+	dbus_error_init(&error);
+
+	if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_SIGNAL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	/* Disconnected from DBus */
+	if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+		DEBUG("disconnected from DBus");
+		hal_deinit();
+		dbus_connection_unref(dbus_connection);
+		dbus_connection = NULL;
+		g_thread_create((GThreadFunc)ivm_dbus_reinit, NULL, FALSE, NULL);
+		handled = TRUE;
+	}
+
+	/* Check for signal NameOwnerChange */
+	if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
+		char 	*service;
+		char	*old_owner;
+		char	*new_owner;
+
+		if (dbus_message_get_args(message, &error,
+					  DBUS_TYPE_STRING, &service,
+					  DBUS_TYPE_STRING, &old_owner,
+					  DBUS_TYPE_STRING, &new_owner,
+					  DBUS_TYPE_INVALID)) {
+
+			if (dbus_error_is_set(&error)) {
+				log_error("dbus error: %s", error.message);
+				return DBUS_HANDLER_RESULT_HANDLED;
+			}
+
+			gboolean old_owner_good = (old_owner && (strlen(old_owner) > 0));
+			gboolean new_owner_good = (new_owner && (strlen(new_owner) > 0));
+
+			if (strcmp(service, "org.freedesktop.Hal") == 0) {
+				if (!old_owner_good && new_owner_good) {
+					/* Hal just appeared */
+					hal_init();
+					handled = TRUE;
+				}
+				else if (old_owner_good && !new_owner_good) {
+					/* Hal went away */
+					hal_deinit();
+					handled = TRUE;
+				}
+			}
+		}
+
+	}
+
+	return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+}
Index: ivman-0.6.13/src/dbus_interface.h
===================================================================
--- ivman-0.6.13.orig/src/dbus_interface.h
+++ ivman-0.6.13/src/dbus_interface.h
@@ -21,4 +21,12 @@
 #include "common.h"
 
 void
-ivm_check_dbus_error(const DBusError * error);
+ivm_check_dbus_error(DBusError * error);
+
+void ivm_dbus_init();
+
+void *ivm_dbus_reinit();
+
+DBusHandlerResult ivm_dbus_signal_filter(DBusConnection *connection, DBusMessage *message, void *user_data);
+
+char *ivm_dbus_get_name_owner(const char *name);
Index: ivman-0.6.13/src/common.h
===================================================================
--- ivman-0.6.13.orig/src/common.h
+++ ivman-0.6.13/src/common.h
@@ -52,6 +52,7 @@ GHashTable *execuns;
 GHashTable *pss;
 GMainLoop *loop;
 LibHalContext *hal_ctx;
+DBusConnection *dbus_connection;
 
 void xmlReadFailed(char const * filename);
 
Index: ivman-0.6.13/src/hal_interface.c
===================================================================
--- ivman-0.6.13.orig/src/hal_interface.c
+++ ivman-0.6.13/src/hal_interface.c
@@ -23,6 +23,7 @@
 #include "common.h"
 #include "manager.h"
 #include "hal_interface.h"
+#include "log.h"
 
 #include <string.h>
 
@@ -275,14 +276,6 @@ hal_mainloop_integration(LibHalContext *
 dbus_bool_t
 hal_mainloop_integration(LibHalContext * ctx, DBusError * error)
 {
-    DBusConnection *dbus_connection =
-        dbus_bus_get(DBUS_BUS_SYSTEM, error);
-
-    if ( !dbus_connection ) {
-        ivm_check_dbus_error(error);
-        return FALSE;
-    }
-
     dbus_connection_setup_with_g_main(dbus_connection, NULL);
 
     return libhal_ctx_set_dbus_connection(ctx, dbus_connection);
@@ -290,6 +283,36 @@ hal_mainloop_integration(LibHalContext *
 }
 #endif
 
+void hal_init(void)
+{
+        DEBUG("Initializing HAL");
+	setupHAL();
+}
+
+void hal_deinit(void)
+{
+	DEBUG("Disconnected from HAL");
+
+	if (hal_ctx)
+	{
+		DBusError error;
+
+		dbus_error_init (&error);
+		libhal_ctx_shutdown (hal_ctx, &error);
+		if (dbus_error_is_set(&error))
+		{
+			log_notice("libhal shutdown failed - %s", error.message);
+			dbus_error_free (&error);
+		}
+		libhal_ctx_free(hal_ctx);
+		hal_ctx = NULL;
+	}
+
+	g_hash_table_destroy(devices);
+	g_hash_table_destroy(execuns);
+	g_hash_table_destroy(pss);
+}
+
 void dump_devices()
 {
     g_hash_table_foreach(devices, print_device, NULL);
Index: ivman-0.6.13/src/manager.c
===================================================================
--- ivman-0.6.13.orig/src/manager.c
+++ ivman-0.6.13/src/manager.c
@@ -1424,8 +1424,23 @@ int main(int argc, char *argv[])
     parseArguments(argc, argv);
     do_startup_configure();
 
-    // Connect to HAL
-    setupHAL();
+    if (!g_thread_supported ())
+	g_thread_init (NULL);
+    dbus_g_thread_init ();
+
+    /* Setup DBus */
+    ivm_dbus_init();
+    if (dbus_connection != NULL) {
+	    /* If Hal is around */
+	    if ((ivm_dbus_get_name_owner("org.freedesktop.Hal")))
+		    hal_init();
+    } else {
+	    /* Try connecting to dbus */
+	    do {
+		    g_usleep (G_USEC_PER_SEC * 3);
+		    ivm_dbus_init();
+	    } while (dbus_connection == NULL);
+    }
 
     DEBUG("%s, http:/ivman.sourceforge.net\n", PACKAGE_STRING);
 
Index: ivman-0.6.13/src/hal_interface.h
===================================================================
--- ivman-0.6.13.orig/src/hal_interface.h
+++ ivman-0.6.13/src/hal_interface.h
@@ -66,5 +66,8 @@ dbus_bool_t hal_mainloop_integration(Lib
 
 
 void
-ivm_check_dbus_error(const DBusError * error);
+ivm_check_dbus_error(DBusError * error);
 #endif
+
+void hal_init(void);
+void hal_deinit(void);
Index: ivman-0.6.13/configure.in
===================================================================
--- ivman-0.6.13.orig/configure.in
+++ ivman-0.6.13/configure.in
@@ -63,6 +63,13 @@ fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.6.0 , have_gthread=true, have_gthread=false)
+if test "x$have_gthread" = "xfalse" ; then
+    AC_MSG_ERROR([No Gthread found, check config.log for failed attempts])
+fi
+AC_SUBST(GTHREAD_CFLAGS)
+AC_SUBST(GTHREAD_LIBS)
+
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.3 , have_dbus_glib=true, have_dbus_glib=false)
 if test "x$have_dbus_glib" = "xfalse" ; then
     AC_MSG_ERROR([No Dbus-Glib found, check config.log for failed attempts])
Index: ivman-0.6.13/src/Makefile.am
===================================================================
--- ivman-0.6.13.orig/src/Makefile.am
+++ ivman-0.6.13/src/Makefile.am
@@ -1,11 +1,11 @@
-INCLUDES= $(DBUS_GLIB_CFLAGS) $(HAL_CFLAGS) $(LIBXML_CFLAGS) $(GLIB_CFLAGS)
+INCLUDES= $(DBUS_GLIB_CFLAGS) $(HAL_CFLAGS) $(LIBXML_CFLAGS) $(GTHREAD_CFLAGS)
 
 bin_PROGRAMS = ivman
 ivman_SOURCES = manager.c hal_interface.c daemonize.c log.c debug.c \
 	hal_psi.c dbus_interface.c IvmConfig/IvmConfigBase.c \
 	IvmConfig/IvmConfigActions.c IvmConfig/IvmConfigProperties.c \
 	IvmConfig/IvmConfigCommon.c IvmConfig/IvmConfigConditions.c
-ivman_LDADD = $(LIBXML_LIBS) $(GLIB_LIBS) $(HAL_LIBS) $(DBUS_GLIB_LIBS)
+ivman_LDADD = $(LIBXML_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) $(DBUS_GLIB_LIBS)
 
 noinst_HEADERS = manager.h hal_interface.h daemonize.h log.h debug.h \
 	common.h userconfigs.h hal_psi.h dbus_interface.h hal_compat.h \
Index: ivman-0.6.13/src/manager.h
===================================================================
--- ivman-0.6.13.orig/src/manager.h
+++ ivman-0.6.13/src/manager.h
@@ -33,4 +33,7 @@ void ivm_run_commands(char **commands, c
 
 // Free an array of strings
 void ivm_free_str_array(char **strings);
+
+void setupHAL(void);
+
 #endif

Places

File ivman-0.6.13-dbus_hal.patch of Package ivman (Revision 150be9b3d2bb7dc1927793623c1be4ea)

Places