File NetworkManager-systemd-suspend.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File NetworkManager-systemd-suspend.patch of Package NetworkManager (Revision e296e358e59250a65e24e8b6f40940ae)

Currently displaying revision e296e358e59250a65e24e8b6f40940ae , Show latest

From ea0c3a3e0fcbe400a704692d3b436d4733d348a1 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 09 Oct 2012 04:39:03 +0000
Subject: core: add a systemd suspend/resume monitor (bgo #677694)

This implementation uses a delay inhibitor to get systemd to
emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
when receiving the before/after PrepareForSleep emissions.
---
Index: NetworkManager-0.9.6.4/configure.ac
===================================================================
--- NetworkManager-0.9.6.4.orig/configure.ac
+++ NetworkManager-0.9.6.4/configure.ac
@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 14
 AC_SUBST(GUDEV_CFLAGS)
 AC_SUBST(GUDEV_LIBS)
 
-PKG_CHECK_MODULES(GIO, gio-2.0)
+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
Index: NetworkManager-0.9.6.4/src/Makefile.am
===================================================================
--- NetworkManager-0.9.6.4.orig/src/Makefile.am
+++ NetworkManager-0.9.6.4/src/Makefile.am
@@ -193,7 +193,6 @@ NetworkManager_SOURCES = \
 		nm-session-utils.c \
 		nm-session-utils.h \
 		nm-sleep-monitor.h \
-		nm-sleep-monitor.c \
 		nm-connection-provider.h \
 		nm-connection-provider.c
 
@@ -202,13 +201,18 @@ NetworkManager_SOURCES += nm-connectivit
 endif
 
 if SESSION_TRACKING_SYSTEMD
-NetworkManager_SOURCES += nm-session-monitor-systemd.c
+NetworkManager_SOURCES += \
+		nm-session-monitor-systemd.c \
+		nm-sleep-monitor-systemd.c
 else
 if SESSION_TRACKING_CK
 NetworkManager_SOURCES += nm-session-monitor-ck.c
 else
 NetworkManager_SOURCES += nm-session-monitor-null.c
 endif
+
+# UPower suspend/resume used whenever systemd is not enabled
+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
 endif
 
 nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
@@ -284,6 +288,7 @@ BUILT_SOURCES = \
 NetworkManager_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(GUDEV_CFLAGS) \
 	$(LIBNL_CFLAGS) \
 	$(GMODULE_CFLAGS) \
Index: NetworkManager-0.9.6.4/src/nm-sleep-monitor-systemd.c
===================================================================
--- /dev/null
+++ NetworkManager-0.9.6.4/src/nm-sleep-monitor-systemd.c
@@ -0,0 +1,217 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2012 Red Hat, Inc.
+ * Author: Matthias Clasen <mclasen@redhat.com>
+ */
+
+#include "config.h"
+#include <errno.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-glib.h>
+#include <gio/gio.h>
+#include <gio/gunixfdlist.h>
+
+#include "nm-logging.h"
+#include "nm-dbus-manager.h"
+
+#include "nm-sleep-monitor.h"
+
+#define SD_NAME              "org.freedesktop.login1"
+#define SD_PATH              "/org/freedesktop/login1"
+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
+
+
+struct _NMSleepMonitor {
+	GObject parent_instance;
+
+	GDBusProxy *sd_proxy;
+	gint inhibit_fd;
+};
+
+struct _NMSleepMonitorClass {
+	GObjectClass parent_class;
+
+	void (*sleeping) (NMSleepMonitor *monitor);
+	void (*resuming) (NMSleepMonitor *monitor);
+};
+
+
+enum {
+	SLEEPING,
+	RESUMING,
+	LAST_SIGNAL,
+};
+static guint signals[LAST_SIGNAL] = {0};
+
+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
+
+/********************************************************************/
+
+static void
+inhibit_done (GObject      *source,
+              GAsyncResult *result,
+              gpointer      user_data)
+{
+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
+	NMSleepMonitor *self = user_data;
+	GError *error = NULL;
+	GVariant *res;
+	GUnixFDList *fd_list;
+
+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
+	if (!res) {
+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
+		g_error_free (error);
+	} else {
+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
+
+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
+
+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
+		g_object_unref (fd_list);
+		g_variant_unref (res);
+	}
+}
+
+static void
+take_inhibitor (NMSleepMonitor *self)
+{
+	g_assert (self->inhibit_fd == -1);
+
+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
+	                                     "Inhibit",
+	                                     g_variant_new ("(ssss)",
+	                                                    "sleep",
+	                                                    g_get_user_name (),
+	                                                    "inhibited",
+	                                                    "delay"),
+	                                     0,
+	                                     G_MAXINT,
+	                                     NULL,
+	                                     NULL,
+	                                     inhibit_done,
+	                                     self);
+}
+
+static gboolean
+drop_inhibitor (NMSleepMonitor *self)
+{
+	if (self->inhibit_fd >= 0) {
+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
+		close (self->inhibit_fd);
+		self->inhibit_fd = -1;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void
+signal_cb (GDBusProxy  *proxy,
+           const gchar *sendername,
+           const gchar *signalname,
+           GVariant    *args,
+           gpointer     data)
+{
+	NMSleepMonitor *self = data;
+	gboolean is_about_to_suspend;
+
+	if (strcmp (signalname, "PrepareForSleep") != 0)
+		return;
+
+	g_variant_get (args, "(b)", &is_about_to_suspend);
+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
+
+	if (is_about_to_suspend) {
+		g_signal_emit (self, signals[SLEEPING], 0);
+		drop_inhibitor (self);
+	} else {
+		take_inhibitor (self);
+		g_signal_emit (self, signals[RESUMING], 0);
+	}
+}
+
+static void
+nm_sleep_monitor_init (NMSleepMonitor *self)
+{
+	GDBusConnection *bus;
+
+	self->inhibit_fd = -1;
+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
+	                                        NULL, NULL);
+	g_object_unref (bus);
+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
+	take_inhibitor (self);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
+
+	drop_inhibitor (self);
+	if (self->sd_proxy)
+		g_object_unref (self->sd_proxy);
+
+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
+}
+
+static void
+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
+{
+	GObjectClass *gobject_class;
+
+	gobject_class = G_OBJECT_CLASS (klass);
+
+	gobject_class->finalize = finalize;
+
+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
+	                                  NM_TYPE_SLEEP_MONITOR,
+	                                  G_SIGNAL_RUN_LAST,
+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
+	                                  NULL,                   /* accumulator      */
+	                                  NULL,                   /* accumulator data */
+	                                  g_cclosure_marshal_VOID__VOID,
+	                                  G_TYPE_NONE, 0);
+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
+	                                  NM_TYPE_SLEEP_MONITOR,
+	                                  G_SIGNAL_RUN_LAST,
+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
+	                                  NULL,                   /* accumulator      */
+	                                  NULL,                   /* accumulator data */
+	                                  g_cclosure_marshal_VOID__VOID,
+	                                  G_TYPE_NONE, 0);
+}
+
+NMSleepMonitor *
+nm_sleep_monitor_get (void)
+{
+	static NMSleepMonitor *singleton = NULL;
+
+	if (singleton)
+		return g_object_ref (singleton);
+
+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
+	return singleton;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor-upower.c
index 488200e..488200e 100644
--- a/src/nm-sleep-monitor.c
+++ b/src/nm-sleep-monitor-upower.c
--
cgit v0.9.0.2-2-gbeb

Places

File NetworkManager-systemd-suspend.patch of Package NetworkManager (Revision e296e358e59250a65e24e8b6f40940ae)

Places