X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogind.c;h=a62802895c1feec12c54adc2fc7c9b0d1a1f9cec;hb=3f49d45a45c6c585098590174c3245d2d9bdde0a;hp=0c26aaddbff3303b16859b895525bfc7b9a43cfb;hpb=202630822f52e06dce8404633407329c38099278;p=elogind.git

diff --git a/src/logind.c b/src/logind.c
index 0c26aaddb..a62802895 100644
--- a/src/logind.c
+++ b/src/logind.c
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/epoll.h>
+#include <sys/ioctl.h>
+#include <linux/vt.h>
 
 #include "logind.h"
 #include "dbus-common.h"
@@ -198,7 +200,6 @@ int manager_add_session(Manager *m, User *u, const char *id, Session **_session)
 
 int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **_user) {
         User *u;
-        int r;
 
         assert(m);
         assert(name);
@@ -215,16 +216,10 @@ int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **
         if (!u)
                 return -ENOMEM;
 
-        r = user_start(u);
-        if (r < 0) {
-                user_stop(u);
-                user_free(u);
-        } else {
-                if (_user)
-                        *_user = u;
-        }
+        if (_user)
+                *_user = u;
 
-        return r;
+        return 0;
 }
 
 int manager_add_user_by_name(Manager *m, const char *name, User **_user) {
@@ -255,33 +250,62 @@ int manager_add_user_by_uid(Manager *m, uid_t uid, User **_user) {
 }
 
 int manager_process_device(Manager *m, struct udev_device *d) {
-        const char *sn;
-        Seat *seat;
         Device *device;
         int r;
 
         assert(m);
 
-        sn = udev_device_get_property_value(d, "SEAT");
-        if (!sn)
-                sn = "seat0";
+        /* FIXME: drop this check as soon as libudev's enum support
+         * honours tags and subsystem matches at the same time */
+        if (!streq_ptr(udev_device_get_subsystem(d), "graphics"))
+                return 0;
 
-        r = manager_add_device(m, udev_device_get_syspath(d), &device);
-        if (r < 0)
-                return r;
+        if (streq_ptr(udev_device_get_action(d), "remove")) {
 
-        r = manager_add_seat(m, sn, &seat);
-        if (r < 0)
-                return r;
+                /* FIXME: use syspath instead of sysname here, as soon as fb driver is fixed */
+                device = hashmap_get(m->devices, udev_device_get_sysname(d));
+                if (!device)
+                        return 0;
+
+                seat_add_to_gc_queue(device->seat);
+                device_free(device);
+
+        } else {
+                const char *sn;
+                Seat *seat;
+
+                sn = udev_device_get_property_value(d, "ID_SEAT");
+                if (!sn)
+                        sn = "seat0";
+
+                if (!seat_name_is_valid(sn)) {
+                        log_warning("Device with invalid seat name %s found, ignoring.", sn);
+                        return 0;
+                }
+
+                r = manager_add_device(m, udev_device_get_sysname(d), &device);
+                if (r < 0)
+                        return r;
+
+                r = manager_add_seat(m, sn, &seat);
+                if (r < 0) {
+                        if (!device->seat)
+                                device_free(device);
+
+                        return r;
+                }
+
+                device_attach(device, seat);
+                seat_start(seat);
+        }
 
-        device_attach(device, seat);
         return 0;
 }
 
 int manager_enumerate_devices(Manager *m) {
         struct udev_list_entry *item = NULL, *first = NULL;
         struct udev_enumerate *e;
-        int r = -ENOMEM;
+        int r;
 
         assert(m);
 
@@ -289,16 +313,21 @@ int manager_enumerate_devices(Manager *m) {
          * necessary */
 
         e = udev_enumerate_new(m->udev);
-        if (!e)
-                return -ENOMEM;
+        if (!e) {
+                r = -ENOMEM;
+                goto finish;
+        }
 
-        if (udev_enumerate_add_match_subsystem(e, "graphics") < 0)
+        r = udev_enumerate_add_match_subsystem(e, "graphics");
+        if (r < 0)
                 goto finish;
 
-        if (udev_enumerate_add_match_tag(e, "seat") < 0)
+        r = udev_enumerate_add_match_tag(e, "seat");
+        if (r < 0)
                 goto finish;
 
-        if (udev_enumerate_scan_devices(e) < 0)
+        r = udev_enumerate_scan_devices(e);
+        if (r < 0)
                 goto finish;
 
         first = udev_enumerate_get_list_entry(e);
@@ -307,8 +336,10 @@ int manager_enumerate_devices(Manager *m) {
                 int k;
 
                 d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
-                if (!d)
+                if (!d) {
+                        r = -ENOMEM;
                         goto finish;
+                }
 
                 k = manager_process_device(m, d);
                 udev_device_unref(d);
@@ -383,24 +414,61 @@ static int manager_enumerate_users_from_cgroup(Manager *m) {
 
         while ((r = cg_read_subgroup(d, &name)) > 0) {
                 User *user;
+                int k;
+
+                k = manager_add_user_by_name(m, name, &user);
+                if (k < 0) {
+                        free(name);
+                        r = k;
+                        continue;
+                }
+
+                user_add_to_gc_queue(user);
+
+                if (!user->cgroup_path)
+                        if (asprintf(&user->cgroup_path, "%s/%s", m->cgroup_path, name) < 0) {
+                                r = -ENOMEM;
+                                free(name);
+                                break;
+                        }
 
-                r = manager_add_user_by_name(m, name, &user);
                 free(name);
+        }
 
-                if (r < 0)
-                        break;
+        closedir(d);
+
+        return r;
+}
+
+
+static int manager_enumerate_linger_users(Manager *m) {
+        DIR *d;
+        struct dirent *de;
+        int r = 0;
+
+        d = opendir("/var/lib/systemd/linger");
+        if (!d) {
+                if (errno == ENOENT)
+                        return 0;
+
+                log_error("Failed to open /var/lib/systemd/linger/: %m");
+                return -errno;
+        }
+
+        while ((de = readdir(d))) {
+                int k;
 
-                if (user->cgroup_path)
+                if (!dirent_is_file(de))
                         continue;
 
-                if (asprintf(&user->cgroup_path, "%s/%s", m->cgroup_path, name) < 0) {
-                        r = -ENOMEM;
-                        break;
+                k = manager_add_user_by_name(m, de->d_name, NULL);
+                if (k < 0) {
+                        log_notice("Couldn't add lingering user %s: %s", de->d_name, strerror(-k));
+                        r = k;
                 }
         }
 
-        if (d)
-                closedir(d);
+        closedir(d);
 
         return r;
 }
@@ -408,12 +476,19 @@ static int manager_enumerate_users_from_cgroup(Manager *m) {
 int manager_enumerate_users(Manager *m) {
         DIR *d;
         struct dirent *de;
-        int r;
+        int r, k;
 
         assert(m);
 
+        /* First, enumerate user cgroups */
         r = manager_enumerate_users_from_cgroup(m);
 
+        /* Second, add lingering users on top */
+        k = manager_enumerate_linger_users(m);
+        if (k < 0)
+                r = k;
+
+        /* Third, read in user data stored on disk */
         d = opendir("/run/systemd/users");
         if (!d) {
                 if (errno == ENOENT)
@@ -426,7 +501,6 @@ int manager_enumerate_users(Manager *m) {
         while ((de = readdir(d))) {
                 unsigned long ul;
                 User *u;
-                int k;
 
                 if (!dirent_is_file(de))
                         continue;
@@ -463,6 +537,9 @@ static int manager_enumerate_sessions_from_cgroup(Manager *m) {
                 char *name;
                 int k;
 
+                if (!u->cgroup_path)
+                        continue;
+
                 k = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, &d);
                 if (k < 0) {
                         if (k == -ENOENT)
@@ -477,18 +554,21 @@ static int manager_enumerate_sessions_from_cgroup(Manager *m) {
                         Session *session;
 
                         k = manager_add_session(m, u, name, &session);
-                        free(name);
-
-                        if (k < 0)
+                        if (k < 0) {
+                                free(name);
                                 break;
+                        }
 
-                        if (session->cgroup_path)
-                                continue;
+                        session_add_to_gc_queue(session);
 
-                        if (asprintf(&session->cgroup_path, "%s/%s", u->cgroup_path, name) < 0) {
-                                k = -ENOMEM;
-                                break;
-                        }
+                        if (!session->cgroup_path)
+                                if (asprintf(&session->cgroup_path, "%s/%s", u->cgroup_path, name) < 0) {
+                                        k = -ENOMEM;
+                                        free(name);
+                                        break;
+                                }
+
+                        free(name);
                 }
 
                 closedir(d);
@@ -507,8 +587,10 @@ int manager_enumerate_sessions(Manager *m) {
 
         assert(m);
 
+        /* First enumerate session cgroups */
         r = manager_enumerate_sessions_from_cgroup(m);
 
+        /* Second, read in session data stored on disk */
         d = opendir("/run/systemd/sessions");
         if (!d) {
                 if (errno == ENOENT)
@@ -541,38 +623,6 @@ int manager_enumerate_sessions(Manager *m) {
         return r;
 }
 
-int manager_start_linger_users(Manager *m) {
-        DIR *d;
-        struct dirent *de;
-        int r = 0;
-
-        d = opendir("/var/lib/systemd/linger");
-        if (!d) {
-                if (errno == ENOENT)
-                        return 0;
-
-                log_error("Failed to open /var/lib/systemd/linger/: %m");
-                return -errno;
-        }
-
-        while ((de = readdir(d))) {
-                int k;
-
-                if (!dirent_is_file(de))
-                        continue;
-
-                k = manager_add_user_by_name(m, de->d_name, NULL);
-                if (k < 0) {
-                        log_notice("Couldn't add lingering user %s: %s", de->d_name, strerror(-k));
-                        r = k;
-                }
-        }
-
-        closedir(d);
-
-        return r;
-}
-
 int manager_dispatch_udev(Manager *m) {
         struct udev_device *d;
         int r;
@@ -590,55 +640,46 @@ int manager_dispatch_udev(Manager *m) {
 }
 
 int manager_dispatch_console(Manager *m) {
-        char t[64];
-        ssize_t k;
-        int r, vtnr;
-
         assert(m);
 
-        lseek(m->console_active_fd, SEEK_SET, 0);
+        if (m->vtconsole)
+                seat_read_active_vt(m->vtconsole);
 
-        k = read(m->console_active_fd, t, sizeof(t)-1);
-        if (k <= 0) {
-                log_error("Failed to read current console: %s", k < 0 ? strerror(-errno) : "EOF");
-                return k < 0 ? -errno : -EIO;
-        }
+        return 0;
+}
 
-        t[k] = 0;
-        if (!startswith(t, "tty")) {
-                log_error("Hm, /sys/class/tty/tty0/active is badly formatted.");
-                return -EIO;
-        }
+static int vt_is_busy(int vtnr) {
+        struct vt_stat vt_stat;
+        int r = 0, fd;
 
-        r = safe_atoi(t+3, &vtnr);
-        if (r < 0) {
-                log_error("Failed to parse VT number %s", t+3);
-                return r;
-        }
+        assert(vtnr >= 1);
 
-        if (vtnr <= 0) {
-                log_error("VT number invalid: %s", t+3);
-                return -EIO;
-        }
+        fd = open_terminal("/dev/tty0", O_RDWR|O_NOCTTY|O_CLOEXEC);
+        if (fd < 0)
+                return -errno;
 
-        if (m->vtconsole)
-                seat_active_vt_changed(m->vtconsole, vtnr);
+        if (ioctl(fd, VT_GETSTATE, &vt_stat) < 0)
+                r = -errno;
+        else
+                r = !!(vt_stat.v_state & (1 << vtnr));
 
-        return 0;
+        close_nointr_nofail(fd);
+
+        return r;
 }
 
 int manager_spawn_autovt(Manager *m, int vtnr) {
+        int r;
+
         assert(m);
 
-        return 0;
-}
+        r = vt_is_busy(vtnr);
+        if (r != 0)
+                return r;
 
-static DBusHandlerResult login_message_handler(
-                DBusConnection *connection,
-                DBusMessage *message,
-                void *userdata) {
+        /* ... */
 
-        return DBUS_HANDLER_RESULT_HANDLED;
+        return 0;
 }
 
 static DBusHandlerResult login_message_filter(
@@ -646,14 +687,10 @@ static DBusHandlerResult login_message_filter(
                 DBusMessage *message,
                 void *userdata) {
 
-        return DBUS_HANDLER_RESULT_HANDLED;
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 static int manager_connect_bus(Manager *m) {
-        const DBusObjectPathVTable login_vtable = {
-                .message_function = login_message_handler
-        };
-
         DBusError error;
         int r;
         struct epoll_event ev;
@@ -671,13 +708,11 @@ static int manager_connect_bus(Manager *m) {
                 goto fail;
         }
 
-        if (!dbus_connection_register_object_path(m->bus, "/org/freedesktop/login1", &login_vtable, NULL)) {
-                log_error("Not enough memory");
-                r = -ENOMEM;
-                goto fail;
-        }
-
-        if (!dbus_connection_add_filter(m->bus, login_message_filter, m, NULL)) {
+        if (!dbus_connection_register_object_path(m->bus, "/org/freedesktop/login1", &bus_manager_vtable, m) ||
+            !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/seat", &bus_seat_vtable, m) ||
+            !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/session", &bus_session_vtable, m) ||
+            !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/user", &bus_user_vtable, m) ||
+            !dbus_connection_add_filter(m->bus, login_message_filter, m, NULL)) {
                 log_error("Not enough memory");
                 r = -ENOMEM;
                 goto fail;
@@ -736,7 +771,7 @@ static int manager_connect_console(Manager *m) {
         }
 
         zero(ev);
-        ev.events = EPOLLIN;
+        ev.events = 0;
         ev.data.u32 = FD_CONSOLE;
 
         if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->console_active_fd, &ev) < 0)
@@ -747,6 +782,7 @@ static int manager_connect_console(Manager *m) {
 
 static int manager_connect_udev(Manager *m) {
         struct epoll_event ev;
+        int r;
 
         assert(m);
         assert(!m->udev_monitor);
@@ -755,13 +791,17 @@ static int manager_connect_udev(Manager *m) {
         if (!m->udev_monitor)
                 return -ENOMEM;
 
-        udev_monitor_filter_add_match_tag(m->udev_monitor, "seat");
+        r = udev_monitor_filter_add_match_tag(m->udev_monitor, "seat");
+        if (r < 0)
+                return r;
 
-        if (udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "graphics", NULL) < 0)
-                return -ENOMEM;
+        r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "graphics", NULL);
+        if (r < 0)
+                return r;
 
-        if (udev_monitor_enable_receiving(m->udev_monitor) < 0)
-                return -ENOMEM;
+        r = udev_monitor_enable_receiving(m->udev_monitor);
+        if (r < 0)
+                return r;
 
         m->udev_fd = udev_monitor_get_fd(m->udev_monitor);
 
@@ -775,8 +815,50 @@ static int manager_connect_udev(Manager *m) {
         return 0;
 }
 
+void manager_gc(Manager *m) {
+        Seat *seat;
+        Session *session;
+        User *user;
+
+        assert(m);
+
+        while ((seat = m->seat_gc_queue)) {
+                LIST_REMOVE(Seat, gc_queue, m->seat_gc_queue, seat);
+                seat->in_gc_queue = false;
+
+                if (seat_check_gc(seat) == 0) {
+                        seat_stop(seat);
+                        seat_free(seat);
+                }
+        }
+
+        while ((session = m->session_gc_queue)) {
+                LIST_REMOVE(Session, gc_queue, m->session_gc_queue, session);
+                session->in_gc_queue = false;
+
+                if (session_check_gc(session) == 0) {
+                        session_stop(session);
+                        session_free(session);
+                }
+        }
+
+        while ((user = m->user_gc_queue)) {
+                LIST_REMOVE(User, gc_queue, m->user_gc_queue, user);
+                user->in_gc_queue = false;
+
+                if (user_check_gc(user) == 0) {
+                        user_stop(user);
+                        user_free(user);
+                }
+        }
+}
+
 int manager_startup(Manager *m) {
         int r;
+        Seat *seat;
+        Session *session;
+        User *user;
+        Iterator i;
 
         assert(m);
         assert(m->epoll_fd <= 0);
@@ -800,14 +882,29 @@ int manager_startup(Manager *m) {
         if (r < 0)
                 return r;
 
+        /* Instantiate magic seat 0 */
+        r = manager_add_seat(m, "seat0", &m->vtconsole);
+        if (r < 0)
+                return r;
+
         /* Deserialize state */
         manager_enumerate_devices(m);
         manager_enumerate_seats(m);
         manager_enumerate_users(m);
         manager_enumerate_sessions(m);
 
-        /* Spawn lingering users */
-        manager_start_linger_users(m);
+        /* Get rid of objects that are no longer used */
+        manager_gc(m);
+
+        /* And start everything */
+        HASHMAP_FOREACH(seat, m->seats, i)
+                seat_start(seat);
+
+        HASHMAP_FOREACH(user, m->users, i)
+                user_start(user);
+
+        HASHMAP_FOREACH(session, m->sessions, i)
+                session_start(session);
 
         return 0;
 }
@@ -819,11 +916,16 @@ int manager_run(Manager *m) {
                 struct epoll_event event;
                 int n;
 
+                manager_gc(m);
+
                 if (dbus_connection_dispatch(m->bus) != DBUS_DISPATCH_COMPLETE)
                         continue;
 
                 n = epoll_wait(m->epoll_fd, &event, 1, -1);
                 if (n < 0) {
+                        if (errno == EINTR || errno == EAGAIN)
+                                continue;
+
                         log_error("epoll() failed: %m");
                         return -errno;
                 }
@@ -849,7 +951,7 @@ int manager_run(Manager *m) {
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        int r = 0;
+        int r;
 
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();