picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logind/machined: properly notice when units are gc'ed

This commit is contained in:
Lennart Poettering 2013-07-03 15:12:58 +02:00
parent 286ca4852e
commit 943aca8efb
4 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/login/logind-dbus.c
View File

@ -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:

12
src/login/logind.c
View File

@ -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',"

22
src/machine/machined-dbus.c
View File

@ -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:

12
src/machine/machined.c
View File

@ -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',"