From 943aca8efb39453e3994ccdd1e08534b788c5aee Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 3 Jul 2013 15:12:58 +0200
Subject: [PATCH] logind/machined: properly notice when units are gc'ed

---
 src/login/logind-dbus.c     | 38 +++++++++++++++++++++++++++++++++++++
 src/login/logind.c          | 12 ++++++++++++
 src/machine/machined-dbus.c | 22 ++++++++++++++++++++-
 src/machine/machined.c      | 12 ++++++++++++
 4 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index a52f020b3..eeff84394 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2411,6 +2411,44 @@ DBusHandlerResult bus_message_filter(
                         if (u)
                                 user_add_to_gc_queue(u);
                 }
+        } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "UnitRemoved")) {
+
+                const char *path, *unit;
+                Session *session;
+                User *user;
+
+                if (!dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_STRING, &unit,
+                                           DBUS_TYPE_OBJECT_PATH, &path,
+                                           DBUS_TYPE_INVALID)) {
+                        log_error("Failed to parse UnitRemoved message: %s", bus_error_message(&error));
+                        goto finish;
+                }
+
+                session = hashmap_get(m->session_units, unit);
+                if (session) {
+                        hashmap_remove(m->session_units, session->scope);
+                        free(session->scope);
+                        session->scope = NULL;
+
+                        session_add_to_gc_queue(session);
+                }
+
+                user = hashmap_get(m->user_units, unit);
+                if (user) {
+
+                        if (streq_ptr(unit, user->service)) {
+                                hashmap_remove(m->user_units, user->service);
+                                free(user->service);
+                                user->service = NULL;
+                        } else if (streq_ptr(unit, user->slice)) {
+                                hashmap_remove(m->user_units, user->slice);
+                                free(user->slice);
+                                user->slice = NULL;
+                        }
+
+                        user_add_to_gc_queue(user);
+                }
         }
 
 finish:
diff --git a/src/login/logind.c b/src/login/logind.c
index e37a1071a..fcb3ccf4a 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1020,6 +1020,18 @@ static int manager_connect_bus(Manager *m) {
                 dbus_error_free(&error);
         }
 
+        dbus_bus_add_match(m->bus,
+                           "type='signal',"
+                           "sender='org.freedesktop.systemd1',"
+                           "interface='org.freedesktop.systemd1.Manager',"
+                           "member='UnitRemoved',"
+                           "path='/org/freedesktop/systemd1'",
+                           &error);
+        if (dbus_error_is_set(&error)) {
+                log_error("Failed to add match for UnitRemoved: %s", bus_error_message(&error));
+                dbus_error_free(&error);
+        }
+
         dbus_bus_add_match(m->bus,
                            "type='signal',"
                            "sender='org.freedesktop.systemd1',"
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index a81f37c5c..1b1eb3a33 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -531,7 +531,6 @@ DBusHandlerResult bus_message_filter(
                         goto finish;
                 }
 
-
                 mm = hashmap_get(m->machine_units, unit);
                 if (mm) {
                         if (streq_ptr(path, mm->scope_job)) {
@@ -570,6 +569,27 @@ DBusHandlerResult bus_message_filter(
                         if (mm)
                                 machine_add_to_gc_queue(mm);
                 }
+
+        } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "UnitRemoved")) {
+                const char *path, *unit;
+                Machine *mm;
+
+                if (!dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_STRING, &unit,
+                                           DBUS_TYPE_OBJECT_PATH, &path,
+                                           DBUS_TYPE_INVALID)) {
+                        log_error("Failed to parse UnitRemoved message: %s", bus_error_message(&error));
+                        goto finish;
+                }
+
+                mm = hashmap_get(m->machine_units, unit);
+                if (mm) {
+                        hashmap_remove(m->machine_units, mm->scope);
+                        free(mm->scope);
+                        mm->scope = NULL;
+
+                        machine_add_to_gc_queue(mm);
+                }
         }
 
 finish:
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 86f8de919..f2803a18c 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -210,6 +210,18 @@ static int manager_connect_bus(Manager *m) {
                 dbus_error_free(&error);
         }
 
+        dbus_bus_add_match(m->bus,
+                           "type='signal',"
+                           "sender='org.freedesktop.systemd1',"
+                           "interface='org.freedesktop.systemd1.Manager',"
+                           "member='UnitRemoved',"
+                           "path='/org/freedesktop/systemd1'",
+                           &error);
+        if (dbus_error_is_set(&error)) {
+                log_error("Failed to add match for UnitRemoved: %s", bus_error_message(&error));
+                dbus_error_free(&error);
+        }
+
         dbus_bus_add_match(m->bus,
                            "type='signal',"
                            "sender='org.freedesktop.systemd1',"
-- 
2.30.2