Classify processes from sessions into cgroups

[elogind.git] / src / login / logind.c

diff --git a/src/login/logind.c b/src/login/logind.c
index 4723b1027152cf3c070db3c044a8868747cf9569..cd0b67119b45b6114fdf1709c0bd55136ed7d297 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -31,13 +31,10 @@
 #include "bus-util.h"
 #include "bus-error.h"
 #include "udev-util.h"
-#include "formats-util.h"
 #include "signal-util.h"
 #include "logind.h"
 
-static void manager_free(Manager *m);
-
-static Manager *manager_new(void) {
+Manager *manager_new(void) {
         Manager *m;
         int r;
 
@@ -96,7 +93,7 @@ fail:
         return NULL;
 }
 
-static void manager_free(Manager *m) {
+void manager_free(Manager *m) {
         Session *session;
         User *u;
         Device *d;
@@ -134,10 +131,6 @@ static void manager_free(Manager *m) {
         set_free_free(m->busnames);
 
         sd_event_source_unref(m->idle_action_event_source);
-        sd_event_source_unref(m->inhibit_timeout_source);
-        sd_event_source_unref(m->scheduled_shutdown_timeout_source);
-        sd_event_source_unref(m->nologin_timeout_source);
-        sd_event_source_unref(m->wall_message_timeout_source);
 
         sd_event_source_unref(m->console_active_event_source);
         sd_event_source_unref(m->udev_seat_event_source);
@@ -160,9 +153,6 @@ static void manager_free(Manager *m) {
         if (m->udev)
                 udev_unref(m->udev);
 
-        if (m->unlink_nologin)
-                (void) unlink("/run/nologin");
-
         bus_verify_polkit_async_registry_free(m->polkit_registry);
 
         sd_bus_unref(m->bus);
@@ -171,10 +161,6 @@ static void manager_free(Manager *m) {
         strv_free(m->kill_only_users);
         strv_free(m->kill_exclude_users);
 
-        free(m->scheduled_shutdown_type);
-        free(m->scheduled_shutdown_tty);
-        free(m->wall_message);
-        free(m->action_job);
         free(m);
 }
 
@@ -552,6 +538,35 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents
         return 0;
 }
 
+static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
+        Manager *m = userdata;
+        Session *s;
+        const char *cgroup;
+        int r;
+
+        assert(bus);
+        assert(message);
+        assert(m);
+
+        r = sd_bus_message_read(message, "s", &cgroup);
+        if (r < 0) {
+                bus_log_parse_error(r);
+                return 0;
+        }
+
+        s = hashmap_get(m->sessions, cgroup);
+
+        if (!s) {
+                log_warning("Session not found: %s", cgroup);
+                return 0;
+        }
+
+        session_finalize(s);
+        session_free(s);
+
+        return 0;
+}
+
 static int manager_connect_bus(Manager *m) {
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
@@ -567,6 +582,13 @@ static int manager_connect_bus(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to add manager object vtable: %m");
 
+        r = sd_bus_add_match(m->bus, NULL,
+                             "type='signal',"
+                             "interface='org.freedesktop.systemd1.Agent',"
+                             "member='Released',"
+                             "path='/org/freedesktop/systemd1/agent'",
+                             signal_agent_released, m);
+
         r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/seat", "org.freedesktop.login1.Seat", seat_vtable, seat_object_find, m);
         if (r < 0)
                 return log_error_errno(r, "Failed to add seat object vtable: %m");
@@ -775,7 +797,7 @@ static int manager_connect_udev(Manager *m) {
         return 0;
 }
 
-static void manager_gc(Manager *m, bool drop_not_started) {
+void manager_gc(Manager *m, bool drop_not_started) {
         Seat *seat;
         Session *session;
         User *user;
@@ -886,7 +908,7 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us
         return 0;
 }
 
-static int manager_startup(Manager *m) {
+int manager_startup(Manager *m) {
         int r;
         Seat *seat;
         Session *session;
@@ -970,12 +992,14 @@ static int manager_startup(Manager *m) {
         return 0;
 }
 
-static int manager_run(Manager *m) {
+int manager_run(Manager *m) {
         int r;
 
         assert(m);
 
         for (;;) {
+                usec_t us = (uint64_t) -1;
+
                 r = sd_event_get_state(m->event);
                 if (r < 0)
                         return r;
@@ -984,13 +1008,19 @@ static int manager_run(Manager *m) {
 
                 manager_gc(m, true);
 
-                r = manager_dispatch_delayed(m, false);
-                if (r < 0)
-                        return r;
-                if (r > 0)
+                if (manager_dispatch_delayed(m) > 0)
                         continue;
 
-                r = sd_event_run(m->event, (uint64_t) -1);
+                if (m->action_what != 0) {
+                        usec_t x, y;
+
+                        x = now(CLOCK_MONOTONIC);
+                        y = m->action_timestamp + m->inhibit_delay_max;
+
+                        us = x >= y ? 0 : y - x;
+                }
+
+                r = sd_event_run(m->event, us);
                 if (r < 0)
                         return r;
         }
@@ -1032,6 +1062,7 @@ int main(int argc, char *argv[]) {
         mkdir_label("/run/systemd/seats", 0755);
         mkdir_label("/run/systemd/users", 0755);
         mkdir_label("/run/systemd/sessions", 0755);
+        mkdir_label("/run/systemd/machines", 0755);
 
         m = manager_new();
         if (!m) {