X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=b7c8f71a52a3d362b6bae01ddb089757caccaef5;hp=8d4f7333c950d7045ce8c4813458113bb6bed8c4;hb=da22b4dccb157393d36cfce6656ddbd9f224f5e3;hpb=d889a2069a87e4617b32ddbdeace5a53a12c699d diff --git a/src/login/logind.c b/src/login/logind.c index 8d4f7333c..b97698100 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of systemd. @@ -20,81 +18,192 @@ ***/ #include -#include -#include #include #include #include -#include -#include -#include -#include +#if 0 /// elogind needs the systems udev header +#include "libudev.h" +#else +#include +#endif // 0 +#include "sd-daemon.h" +#include "alloc-util.h" +#include "bus-error.h" +#include "bus-util.h" +#include "conf-parser.h" +#include "def.h" +#include "dirent-util.h" +#include "fd-util.h" +#include "formats-util.h" #include "logind.h" -#include "dbus-common.h" -#include "dbus-loop.h" +#include "selinux-util.h" +#include "signal-util.h" #include "strv.h" -#include "conf-parser.h" +#include "udev-util.h" + +/// additional includes elogind needs +#include "cgroup.h" // From src/core/ +#include "label.h" +#include "mount-setup.h" // From src/core +#include "musl_missing.h" + +static void manager_free(Manager *m); + +static void manager_reset_config(Manager *m) { -Manager *manager_new(void) { +#ifdef ENABLE_DEBUG_ELOGIND + int dbg_cnt; +#endif // ENABLE_DEBUG_ELOGIND + +#if 0 /// elogind does not support autospawning of vts + m->n_autovts = 6; + m->reserve_vt = 6; +#endif // 0 + m->remove_ipc = true; + m->inhibit_delay_max = 5 * USEC_PER_SEC; + m->handle_power_key = HANDLE_POWEROFF; + m->handle_suspend_key = HANDLE_SUSPEND; + m->handle_hibernate_key = HANDLE_HIBERNATE; + m->handle_lid_switch = HANDLE_SUSPEND; + m->handle_lid_switch_docked = HANDLE_IGNORE; + m->power_key_ignore_inhibited = false; + m->suspend_key_ignore_inhibited = false; + m->hibernate_key_ignore_inhibited = false; + m->lid_switch_ignore_inhibited = true; + + m->holdoff_timeout_usec = 30 * USEC_PER_SEC; + + m->idle_action_usec = 30 * USEC_PER_MINUTE; + m->idle_action = HANDLE_IGNORE; + + m->runtime_dir_size = physical_memory_scale(10U, 100U); /* 10% */ + m->user_tasks_max = system_tasks_max_scale(33U, 100U); /* 33% */ + m->sessions_max = 8192; + m->inhibitors_max = 8192; + + m->kill_user_processes = KILL_USER_PROCESSES; + + m->kill_only_users = strv_free(m->kill_only_users); + m->kill_exclude_users = strv_free(m->kill_exclude_users); + + /* Set default Sleep config if not already set by logind.conf */ + if (!m->suspend_state) + m->suspend_state = strv_new("mem", "standby", "freeze", NULL); + if (!m->hibernate_mode) + m->hibernate_mode = strv_new("platform", "shutdown", NULL); + if (!m->hibernate_state) + m->hibernate_state = strv_new("disk", NULL); + if (!m->hybrid_sleep_mode) + m->hybrid_sleep_mode = strv_new("suspend", "platform", "shutdown", NULL); + if (!m->hybrid_sleep_state) + m->hybrid_sleep_state = strv_new("disk", NULL); + +#ifdef ENABLE_DEBUG_ELOGIND + dbg_cnt = -1; + while (m->suspend_mode && m->suspend_mode[++dbg_cnt]) + log_debug_elogind("suspend_mode[%d] = %s", + dbg_cnt, m->suspend_mode[dbg_cnt]); + dbg_cnt = -1; + while (m->suspend_state[++dbg_cnt]) + log_debug_elogind("suspend_state[%d] = %s", + dbg_cnt, m->suspend_state[dbg_cnt]); + dbg_cnt = -1; + while (m->hibernate_mode[++dbg_cnt]) + log_debug_elogind("hibernate_mode[%d] = %s", + dbg_cnt, m->hibernate_mode[dbg_cnt]); + dbg_cnt = -1; + while (m->hibernate_state[++dbg_cnt]) + log_debug_elogind("hibernate_state[%d] = %s", + dbg_cnt, m->hibernate_state[dbg_cnt]); + dbg_cnt = -1; + while (m->hybrid_sleep_mode[++dbg_cnt]) + log_debug_elogind("hybrid_sleep_mode[%d] = %s", + dbg_cnt, m->hybrid_sleep_mode[dbg_cnt]); + dbg_cnt = -1; + while (m->hybrid_sleep_state[++dbg_cnt]) + log_debug_elogind("hybrid_sleep_state[%d] = %s", + dbg_cnt, m->hybrid_sleep_state[dbg_cnt]); +#endif // ENABLE_DEBUG_ELOGIND +} + +static Manager *manager_new(void) { Manager *m; + int r; m = new0(Manager, 1); if (!m) return NULL; + m->pin_cgroupfs_fd = -1; m->console_active_fd = -1; - m->bus_fd = -1; - m->udev_seat_fd = -1; - m->udev_vcsa_fd = -1; - m->epoll_fd = -1; - m->n_autovts = 6; - m->inhibit_delay_max = 5 * USEC_PER_SEC; +#if 0 /// UNNEEDED by elogind + m->reserve_vt_fd = -1; +#endif // 0 - m->devices = hashmap_new(string_hash_func, string_compare_func); - m->seats = hashmap_new(string_hash_func, string_compare_func); - m->sessions = hashmap_new(string_hash_func, string_compare_func); - m->users = hashmap_new(trivial_hash_func, trivial_compare_func); - m->inhibitors = hashmap_new(string_hash_func, string_compare_func); + m->idle_action_not_before_usec = now(CLOCK_MONOTONIC); - m->cgroups = hashmap_new(string_hash_func, string_compare_func); - m->session_fds = hashmap_new(trivial_hash_func, trivial_compare_func); - m->inhibitor_fds = hashmap_new(trivial_hash_func, trivial_compare_func); + m->devices = hashmap_new(&string_hash_ops); + m->seats = hashmap_new(&string_hash_ops); + m->sessions = hashmap_new(&string_hash_ops); + m->users = hashmap_new(NULL); + m->inhibitors = hashmap_new(&string_hash_ops); + m->buttons = hashmap_new(&string_hash_ops); - if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || - !m->cgroups || !m->session_fds || !m->inhibitor_fds) { - manager_free(m); - return NULL; - } + m->user_units = hashmap_new(&string_hash_ops); + m->session_units = hashmap_new(&string_hash_ops); - m->reset_controllers = strv_new("cpu", NULL); - m->kill_exclude_users = strv_new("root", NULL); - if (!m->reset_controllers || !m->kill_exclude_users) { - manager_free(m); - return NULL; + m->test_run = false; + + if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->user_units || !m->session_units) + goto fail; + + /* If elogind should be its own controller, mount its cgroup */ + if (streq(SYSTEMD_CGROUP_CONTROLLER, "name=elogind")) { + r = mount_setup(true); + if (r < 0) + goto fail; } + /* Make cgroups */ + r = manager_setup_cgroup(m); + if (r < 0) + goto fail; + + m->suspend_mode = NULL; + m->suspend_state = NULL; + m->hibernate_mode = NULL; + m->hibernate_state = NULL; + m->hybrid_sleep_mode = NULL; + m->hybrid_sleep_state = NULL; + m->udev = udev_new(); - if (!m->udev) { - manager_free(m); - return NULL; - } + if (!m->udev) + goto fail; - if (cg_get_user_path(&m->cgroup_path) < 0) { - manager_free(m); - return NULL; - } + r = sd_event_default(&m->event); + if (r < 0) + goto fail; + + sd_event_set_watchdog(m->event, true); + + manager_reset_config(m); return m; + +fail: + manager_free(m); + return NULL; } -void manager_free(Manager *m) { +static void manager_free(Manager *m) { Session *session; User *u; Device *d; Seat *s; Inhibitor *i; + Button *b; assert(m); @@ -113,299 +222,173 @@ void manager_free(Manager *m) { while ((i = hashmap_first(m->inhibitors))) inhibitor_free(i); + while ((b = hashmap_first(m->buttons))) + button_free(b); + hashmap_free(m->devices); hashmap_free(m->seats); hashmap_free(m->sessions); hashmap_free(m->users); hashmap_free(m->inhibitors); + hashmap_free(m->buttons); - hashmap_free(m->cgroups); - hashmap_free(m->session_fds); - hashmap_free(m->inhibitor_fds); - - if (m->console_active_fd >= 0) - close_nointr_nofail(m->console_active_fd); + hashmap_free(m->user_units); + hashmap_free(m->session_units); - if (m->udev_seat_monitor) - udev_monitor_unref(m->udev_seat_monitor); + 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); - if (m->udev_vcsa_monitor) - udev_monitor_unref(m->udev_vcsa_monitor); + sd_event_source_unref(m->console_active_event_source); + sd_event_source_unref(m->udev_seat_event_source); + sd_event_source_unref(m->udev_device_event_source); + sd_event_source_unref(m->udev_vcsa_event_source); + sd_event_source_unref(m->udev_button_event_source); + sd_event_source_unref(m->lid_switch_ignore_event_source); - if (m->udev) - udev_unref(m->udev); + safe_close(m->console_active_fd); - if (m->bus) { - dbus_connection_flush(m->bus); - dbus_connection_close(m->bus); - dbus_connection_unref(m->bus); - } - - if (m->bus_fd >= 0) - close_nointr_nofail(m->bus_fd); + udev_monitor_unref(m->udev_seat_monitor); + udev_monitor_unref(m->udev_device_monitor); + udev_monitor_unref(m->udev_vcsa_monitor); + udev_monitor_unref(m->udev_button_monitor); - if (m->epoll_fd >= 0) - close_nointr_nofail(m->epoll_fd); + udev_unref(m->udev); - strv_free(m->controllers); - strv_free(m->reset_controllers); - strv_free(m->kill_only_users); - strv_free(m->kill_exclude_users); + if (m->unlink_nologin) + (void) unlink("/run/nologin"); - free(m->cgroup_path); - free(m); -} + bus_verify_polkit_async_registry_free(m->polkit_registry); -int manager_add_device(Manager *m, const char *sysfs, Device **_device) { - Device *d; + sd_bus_unref(m->bus); + sd_event_unref(m->event); - assert(m); - assert(sysfs); +#if 0 /// elogind does not support autospawning of vts + safe_close(m->reserve_vt_fd); +#endif // 0 - d = hashmap_get(m->devices, sysfs); - if (d) { - if (_device) - *_device = d; + manager_shutdown_cgroup(m, true); - return 0; - } + strv_free(m->kill_only_users); + strv_free(m->kill_exclude_users); - d = device_new(m, sysfs); - if (!d) - return -ENOMEM; + free(m->scheduled_shutdown_type); + free(m->scheduled_shutdown_tty); + free(m->wall_message); - if (_device) - *_device = d; + strv_free(m->suspend_mode); + strv_free(m->suspend_state); + strv_free(m->hibernate_mode); + strv_free(m->hibernate_state); + strv_free(m->hybrid_sleep_mode); + strv_free(m->hybrid_sleep_state); - return 0; +#if 0 /// UNNEEDED by elogind + free(m->action_job); +#endif // 0 + free(m); } -int manager_add_seat(Manager *m, const char *id, Seat **_seat) { - Seat *s; +static int manager_enumerate_devices(Manager *m) { + struct udev_list_entry *item = NULL, *first = NULL; + _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; + int r; assert(m); - assert(id); - - s = hashmap_get(m->seats, id); - if (s) { - if (_seat) - *_seat = s; - return 0; - } + /* Loads devices from udev and creates seats for them as + * necessary */ - s = seat_new(m, id); - if (!s) + e = udev_enumerate_new(m->udev); + if (!e) return -ENOMEM; - if (_seat) - *_seat = s; + r = udev_enumerate_add_match_tag(e, "master-of-seat"); + if (r < 0) + return r; - return 0; -} + r = udev_enumerate_add_match_is_initialized(e); + if (r < 0) + return r; -int manager_add_session(Manager *m, User *u, const char *id, Session **_session) { - Session *s; + r = udev_enumerate_scan_devices(e); + if (r < 0) + return r; - assert(m); - assert(id); + first = udev_enumerate_get_list_entry(e); + udev_list_entry_foreach(item, first) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + int k; - s = hashmap_get(m->sessions, id); - if (s) { - if (_session) - *_session = s; + d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item)); + if (!d) + return -ENOMEM; - return 0; + k = manager_process_seat_device(m, d); + if (k < 0) + r = k; } - s = session_new(m, u, id); - if (!s) - return -ENOMEM; - - if (_session) - *_session = s; - - return 0; + return r; } -int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **_user) { - User *u; +static int manager_enumerate_buttons(Manager *m) { + _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; + struct udev_list_entry *item = NULL, *first = NULL; + int r; assert(m); - assert(name); - u = hashmap_get(m->users, ULONG_TO_PTR((unsigned long) uid)); - if (u) { - if (_user) - *_user = u; + /* Loads buttons from udev */ + if (m->handle_power_key == HANDLE_IGNORE && + m->handle_suspend_key == HANDLE_IGNORE && + m->handle_hibernate_key == HANDLE_IGNORE && + m->handle_lid_switch == HANDLE_IGNORE && + m->handle_lid_switch_docked == HANDLE_IGNORE) return 0; - } - u = user_new(m, uid, gid, name); - if (!u) + e = udev_enumerate_new(m->udev); + if (!e) return -ENOMEM; - if (_user) - *_user = u; - - return 0; -} - -int manager_add_user_by_name(Manager *m, const char *name, User **_user) { - uid_t uid; - gid_t gid; - int r; - - assert(m); - assert(name); - - r = get_user_creds(&name, &uid, &gid, NULL); + r = udev_enumerate_add_match_subsystem(e, "input"); if (r < 0) return r; - return manager_add_user(m, uid, gid, name, _user); -} - -int manager_add_user_by_uid(Manager *m, uid_t uid, User **_user) { - struct passwd *p; - - assert(m); - - errno = 0; - p = getpwuid(uid); - if (!p) - return errno ? -errno : -ENOENT; - - return manager_add_user(m, uid, p->pw_gid, p->pw_name, _user); -} - -int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor) { - Inhibitor *i; - - assert(m); - assert(id); - - i = hashmap_get(m->inhibitors, id); - if (i) { - if (_inhibitor) - *_inhibitor = i; - - return 0; - } - - i = inhibitor_new(m, id); - if (!i) - return -ENOMEM; - - if (_inhibitor) - *_inhibitor = i; - - return 0; -} - -int manager_process_seat_device(Manager *m, struct udev_device *d) { - Device *device; - int r; - - assert(m); - - if (streq_ptr(udev_device_get_action(d), "remove")) { - - device = hashmap_get(m->devices, udev_device_get_syspath(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 (isempty(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_syspath(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); - } - - return 0; -} - -int manager_enumerate_devices(Manager *m) { - struct udev_list_entry *item = NULL, *first = NULL; - struct udev_enumerate *e; - int r; - - assert(m); - - /* Loads devices from udev and creates seats for them as - * necessary */ - - e = udev_enumerate_new(m->udev); - if (!e) { - r = -ENOMEM; - goto finish; - } - - r = udev_enumerate_add_match_subsystem(e, "graphics"); + r = udev_enumerate_add_match_tag(e, "power-switch"); if (r < 0) - goto finish; + return r; - r = udev_enumerate_add_match_tag(e, "seat"); + r = udev_enumerate_add_match_is_initialized(e); if (r < 0) - goto finish; + return r; r = udev_enumerate_scan_devices(e); if (r < 0) - goto finish; + return r; first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { - struct udev_device *d; + _cleanup_udev_device_unref_ struct udev_device *d = NULL; int k; d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item)); - if (!d) { - r = -ENOMEM; - goto finish; - } - - k = manager_process_seat_device(m, d); - udev_device_unref(d); + if (!d) + return -ENOMEM; + k = manager_process_button_device(m, d); if (k < 0) r = k; } -finish: - if (e) - udev_enumerate_unref(e); - return r; } -int manager_enumerate_seats(Manager *m) { - DIR *d; +static int manager_enumerate_seats(Manager *m) { + _cleanup_closedir_ DIR *d = NULL; struct dirent *de; int r = 0; @@ -420,11 +403,10 @@ int manager_enumerate_seats(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/seats: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /run/systemd/seats: %m"); } - while ((de = readdir(d))) { + FOREACH_DIRENT(de, d, return -errno) { Seat *s; int k; @@ -442,70 +424,25 @@ int manager_enumerate_seats(Manager *m) { r = k; } - closedir(d); - - return r; -} - -static int manager_enumerate_users_from_cgroup(Manager *m) { - int r = 0, k; - char *name; - DIR *d; - - r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_path, &d); - if (r < 0) { - if (r == -ENOENT) - return 0; - - log_error("Failed to open %s: %s", m->cgroup_path, strerror(-r)); - return r; - } - - while ((k = cg_read_subgroup(d, &name)) > 0) { - User *user; - - 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; - } - - free(name); - } - - if (r >= 0 && k < 0) - r = k; - - closedir(d); - return r; } static int manager_enumerate_linger_users(Manager *m) { - DIR *d; + _cleanup_closedir_ DIR *d = NULL; struct dirent *de; int r = 0; + assert(m); + 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; + return log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m"); } - while ((de = readdir(d))) { + FOREACH_DIRENT(de, d, return -errno) { int k; if (!dirent_is_file(de)) @@ -513,119 +450,97 @@ static int manager_enumerate_linger_users(Manager *m) { 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)); + log_notice_errno(k, "Couldn't add lingering user %s: %m", de->d_name); r = k; } } - closedir(d); - return r; } -int manager_enumerate_users(Manager *m) { - DIR *d; +static int manager_enumerate_users(Manager *m) { + _cleanup_closedir_ DIR *d = NULL; struct dirent *de; int r, k; assert(m); - /* First, enumerate user cgroups */ - r = manager_enumerate_users_from_cgroup(m); + /* Add lingering users */ + r = manager_enumerate_linger_users(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 */ + /* Read in user data stored on disk */ d = opendir("/run/systemd/users"); if (!d) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/users: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /run/systemd/users: %m"); } - while ((de = readdir(d))) { - uid_t uid; + FOREACH_DIRENT(de, d, return -errno) { User *u; if (!dirent_is_file(de)) continue; - k = parse_uid(de->d_name, &uid); + k = manager_add_user_by_name(m, de->d_name, &u); if (k < 0) { - log_error("Failed to parse file name %s: %s", de->d_name, strerror(-k)); - continue; - } + log_error_errno(k, "Failed to add user by file name %s: %m", de->d_name); - u = hashmap_get(m->users, ULONG_TO_PTR(uid)); - if (!u) { - unlinkat(dirfd(d), de->d_name, 0); + r = k; continue; } + user_add_to_gc_queue(u); + k = user_load(u); if (k < 0) r = k; } - closedir(d); - return r; } -static int manager_enumerate_sessions_from_cgroup(Manager *m) { - User *u; - Iterator i; +static int manager_enumerate_sessions(Manager *m) { + _cleanup_closedir_ DIR *d = NULL; + struct dirent *de; int r = 0; - HASHMAP_FOREACH(u, m->users, i) { - DIR *d; - char *name; + assert(m); + + /* Read in session data stored on disk */ + d = opendir("/run/systemd/sessions"); + if (!d) { + if (errno == ENOENT) + return 0; + + return log_error_errno(errno, "Failed to open /run/systemd/sessions: %m"); + } + + FOREACH_DIRENT(de, d, return -errno) { + struct Session *s; int k; - if (!u->cgroup_path) + if (!dirent_is_file(de)) continue; - k = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, &d); - if (k < 0) { - if (k == -ENOENT) - continue; - - log_error("Failed to open %s: %s", u->cgroup_path, strerror(-k)); - r = k; + if (!session_id_valid(de->d_name)) { + log_warning("Invalid session file name '%s', ignoring.", de->d_name); + r = -EINVAL; continue; } - while ((k = cg_read_subgroup(d, &name)) > 0) { - Session *session; - - if (streq(name, "shared")) - continue; - - k = manager_add_session(m, u, name, &session); - if (k < 0) { - free(name); - break; - } - - session_add_to_gc_queue(session); - - if (!session->cgroup_path) - if (asprintf(&session->cgroup_path, "%s/%s", u->cgroup_path, name) < 0) { - k = -ENOMEM; - free(name); - break; - } + k = manager_add_session(m, de->d_name, &s); + if (k < 0) { + log_error_errno(k, "Failed to add session by file name %s: %m", de->d_name); - free(name); + r = k; + continue; } - closedir(d); + session_add_to_gc_queue(s); + k = session_load(s); if (k < 0) r = k; } @@ -633,108 +548,75 @@ static int manager_enumerate_sessions_from_cgroup(Manager *m) { return r; } -int manager_enumerate_sessions(Manager *m) { - DIR *d; +static int manager_enumerate_inhibitors(Manager *m) { + _cleanup_closedir_ DIR *d = NULL; struct dirent *de; int r = 0; 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"); + d = opendir("/run/systemd/inhibit"); if (!d) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/sessions: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /run/systemd/inhibit: %m"); } - while ((de = readdir(d))) { - struct Session *s; + FOREACH_DIRENT(de, d, return -errno) { int k; + Inhibitor *i; if (!dirent_is_file(de)) continue; - s = hashmap_get(m->sessions, de->d_name); - if (!s) { - unlinkat(dirfd(d), de->d_name, 0); + k = manager_add_inhibitor(m, de->d_name, &i); + if (k < 0) { + log_notice_errno(k, "Couldn't add inhibitor %s: %m", de->d_name); + r = k; continue; } - k = session_load(s); + k = inhibitor_load(i); if (k < 0) r = k; } - closedir(d); - return r; } -int manager_enumerate_inhibitors(Manager *m) { - DIR *d; - struct dirent *de; - int r = 0; +static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + Manager *m = userdata; assert(m); - d = opendir("/run/systemd/inhibit"); - if (!d) { - if (errno == ENOENT) - return 0; - - log_error("Failed to open /run/systemd/inhibit: %m"); - return -errno; - } - - while ((de = readdir(d))) { - int k; - Inhibitor *i; - - if (!dirent_is_file(de)) - continue; - - k = manager_add_inhibitor(m, de->d_name, &i); - if (k < 0) { - log_notice("Couldn't add inhibitor %s: %s", de->d_name, strerror(-k)); - r = k; - continue; - } - - k = inhibitor_load(i); - if (k < 0) - r = k; - } - - closedir(d); + d = udev_monitor_receive_device(m->udev_seat_monitor); + if (!d) + return -ENOMEM; - return r; + manager_process_seat_device(m, d); + return 0; } -int manager_dispatch_seat_udev(Manager *m) { - struct udev_device *d; - int r; +static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + Manager *m = userdata; assert(m); - d = udev_monitor_receive_device(m->udev_seat_monitor); + d = udev_monitor_receive_device(m->udev_device_monitor); if (!d) return -ENOMEM; - r = manager_process_seat_device(m, d); - udev_device_unref(d); - - return r; + manager_process_seat_device(m, d); + return 0; } -int manager_dispatch_vcsa_udev(Manager *m) { - struct udev_device *d; - int r = 0; +#if 0 /// UNNEEDED by elogind +static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + Manager *m = userdata; const char *name; assert(m); @@ -749,286 +631,263 @@ int manager_dispatch_vcsa_udev(Manager *m) { * VTs, to make sure our auto VTs never go away. */ if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove")) - r = seat_preallocate_vts(m->vtconsole); - - udev_device_unref(d); + seat_preallocate_vts(m->seat0); - return r; + return 0; } +#endif // 0 + +static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + Manager *m = userdata; -int manager_dispatch_console(Manager *m) { assert(m); - if (m->vtconsole) - seat_read_active_vt(m->vtconsole); + d = udev_monitor_receive_device(m->udev_button_monitor); + if (!d) + return -ENOMEM; + manager_process_button_device(m, d); return 0; } -static int vt_is_busy(int vtnr) { - struct vt_stat vt_stat; - int r = 0, fd; - - assert(vtnr >= 1); - - /* We explicitly open /dev/tty1 here instead of /dev/tty0. If - * we'd open the latter we'd open the foreground tty which - * hence would be unconditionally busy. By opening /dev/tty1 - * we avoid this. Since tty1 is special and needs to be an - * explicitly loaded getty or DM this is safe. */ - - fd = open_terminal("/dev/tty1", O_RDWR|O_NOCTTY|O_CLOEXEC); - if (fd < 0) - return -errno; - - if (ioctl(fd, VT_GETSTATE, &vt_stat) < 0) - r = -errno; - else - r = !!(vt_stat.v_state & (1 << vtnr)); +static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + Manager *m = userdata; - close_nointr_nofail(fd); + assert(m); + assert(m->seat0); + assert(m->console_active_fd == fd); - return r; + seat_read_active_vt(m->seat0); + return 0; } -int manager_spawn_autovt(Manager *m, int vtnr) { - int r; - DBusMessage *message = NULL, *reply = NULL; - char *name = NULL; - const char *mode = "fail"; - DBusError error; +#if 0 /// UNNEEDED by elogind +static int manager_reserve_vt(Manager *m) { + _cleanup_free_ char *p = NULL; assert(m); - assert(vtnr >= 1); - dbus_error_init(&error); - - if ((unsigned) vtnr > m->n_autovts) + if (m->reserve_vt <= 0) return 0; - r = vt_is_busy(vtnr); - if (r < 0) - return r; - else if (r > 0) - return -EBUSY; - - message = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"); - if (!message) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; - } - - if (asprintf(&name, "autovt@tty%i.service", vtnr) < 0) { - log_error("Could not allocate service name."); - r = -ENOMEM; - goto finish; - } + if (asprintf(&p, "/dev/tty%u", m->reserve_vt) < 0) + return log_oom(); - if (!dbus_message_append_args(message, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_STRING, &mode, - DBUS_TYPE_INVALID)) { - log_error("Could not attach target and flag information to message."); - r = -ENOMEM; - goto finish; - } + m->reserve_vt_fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK); + if (m->reserve_vt_fd < 0) { - reply = dbus_connection_send_with_reply_and_block(m->bus, message, -1, &error); - if (!reply) { - log_error("Failed to start unit: %s", bus_error_message(&error)); - goto finish; + /* Don't complain on VT-less systems */ + if (errno != ENOENT) + log_warning_errno(errno, "Failed to pin reserved VT: %m"); + return -errno; } - r = 0; - -finish: - free(name); - - if (message) - dbus_message_unref(message); - - if (reply) - dbus_message_unref(reply); - - dbus_error_free(&error); - - return r; + return 0; } +#endif // 0 -int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session) { +static int signal_agent_released(sd_bus_message *message, void *userdata, sd_bus_error *error) { + _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; + Manager *m = userdata; + const char *cgroup; Session *s; - char *p; - - assert(m); - assert(cgroup); - assert(session); - - s = hashmap_get(m->cgroups, cgroup); - if (s) { - *session = s; - return 1; - } - - p = strdup(cgroup); - if (!p) { - log_error("Out of memory."); - return -ENOMEM; - } - - for (;;) { - char *e; - - e = strrchr(p, '/'); - if (!e || e == p) { - free(p); - *session = NULL; - return 0; - } - - *e = 0; - - s = hashmap_get(m->cgroups, p); - if (s) { - free(p); - *session = s; - return 1; - } - } -} - -int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) { - char *p; + uid_t sender_uid; int r; + assert(message); assert(m); - assert(pid >= 1); - assert(session); - r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &p); + /* only accept org.freedesktop.systemd1.Agent from UID=0 */ + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID, &creds); if (r < 0) return r; - r = manager_get_session_by_cgroup(m, p, session); - free(p); - - return r; -} - -void manager_cgroup_notify_empty(Manager *m, const char *cgroup) { - Session *s; - int r; - - r = manager_get_session_by_cgroup(m, cgroup, &s); - if (r <= 0) - return; - - session_add_to_gc_queue(s); -} + r = sd_bus_creds_get_euid(creds, &sender_uid); + if (r < 0 || sender_uid != 0) + return 0; -static void manager_pipe_notify_eof(Manager *m, int fd) { - Session *s; - Inhibitor *i; + /* parse 'cgroup-empty' notification */ + r = sd_bus_message_read(message, "s", &cgroup); + if (r < 0) { + bus_log_parse_error(r); + return 0; + } - assert_se(m); - assert_se(fd >= 0); + s = hashmap_get(m->sessions, cgroup); - s = hashmap_get(m->session_fds, INT_TO_PTR(fd + 1)); - if (s) { - assert(s->fifo_fd == fd); - session_remove_fifo(s); - session_stop(s); - return; + if (!s) { + log_warning("Session not found: %s", cgroup); + return 0; } - i = hashmap_get(m->inhibitor_fds, INT_TO_PTR(fd + 1)); - if (i) { - assert(i->fifo_fd == fd); - inhibitor_stop(i); - inhibitor_free(i); - return; - } + session_finalize(s); + session_free(s); - assert_not_reached("Got EOF on unknown pipe"); + return 0; } static int manager_connect_bus(Manager *m) { - DBusError error; + _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; int r; - struct epoll_event ev; assert(m); assert(!m->bus); - assert(m->bus_fd < 0); - - dbus_error_init(&error); - m->bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); - if (!m->bus) { - log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error)); - r = -ECONNREFUSED; - goto fail; - } + r = sd_bus_default_system(&m->bus); + if (r < 0) + return log_error_errno(r, "Failed to connect to system bus: %m"); - 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, bus_message_filter, m, NULL)) { - log_error("Not enough memory"); - r = -ENOMEM; - goto fail; - } + r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/login1", "org.freedesktop.login1.Manager", manager_vtable, m); + if (r < 0) + return log_error_errno(r, "Failed to add manager object vtable: %m"); + + /* elogind relies on signals from its release agent */ + r = sd_bus_add_match( + m->bus, + NULL, + "type='signal'," + "interface='org.freedesktop.elogind.Agent'," + "member='Released'," + "path='/org/freedesktop/elogind/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"); - dbus_bus_add_match(m->bus, - "type='signal'," - "interface='org.freedesktop.systemd1.Agent'," - "member='Released'," - "path='/org/freedesktop/systemd1/agent'", - &error); + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/seat", seat_node_enumerator, m); + if (r < 0) + return log_error_errno(r, "Failed to add seat enumerator: %m"); - if (dbus_error_is_set(&error)) { - log_error("Failed to register match: %s", bus_error_message(&error)); - r = -EIO; - goto fail; - } + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/session", "org.freedesktop.login1.Session", session_vtable, session_object_find, m); + if (r < 0) + return log_error_errno(r, "Failed to add session object vtable: %m"); - r = dbus_bus_request_name(m->bus, "org.freedesktop.login1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error); - if (dbus_error_is_set(&error)) { - log_error("Failed to register name on bus: %s", bus_error_message(&error)); - r = -EIO; - goto fail; - } + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/session", session_node_enumerator, m); + if (r < 0) + return log_error_errno(r, "Failed to add session enumerator: %m"); - if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - log_error("Failed to acquire name."); - r = -EEXIST; - goto fail; - } + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/user", "org.freedesktop.login1.User", user_vtable, user_object_find, m); + if (r < 0) + return log_error_errno(r, "Failed to add user object vtable: %m"); - m->bus_fd = bus_loop_open(m->bus); - if (m->bus_fd < 0) { - r = m->bus_fd; - goto fail; + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/user", user_node_enumerator, m); + if (r < 0) + return log_error_errno(r, "Failed to add user enumerator: %m"); + +#if 0 /// elogind does not support systemd as PID 1 + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.systemd1.Manager'," + "member='JobRemoved'," + "path='/org/freedesktop/systemd1'", + match_job_removed, m); + if (r < 0) + return log_error_errno(r, "Failed to add match for JobRemoved: %m"); + + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.systemd1.Manager'," + "member='UnitRemoved'," + "path='/org/freedesktop/systemd1'", + match_unit_removed, m); + if (r < 0) + return log_error_errno(r, "Failed to add match for UnitRemoved: %m"); + + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.DBus.Properties'," + "member='PropertiesChanged'", + match_properties_changed, m); + if (r < 0) + return log_error_errno(r, "Failed to add match for PropertiesChanged: %m"); + + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.systemd1.Manager'," + "member='Reloading'," + "path='/org/freedesktop/systemd1'", + match_reloading, m); + if (r < 0) + return log_error_errno(r, "Failed to add match for Reloading: %m"); + + r = sd_bus_call_method( + m->bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "Subscribe", + &error, + NULL, NULL); + if (r < 0) { + log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); + return r; } +#endif // 0 - zero(ev); - ev.events = EPOLLIN; - ev.data.u32 = FD_BUS; + r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); + if (r < 0) + return log_error_errno(r, "Failed to register name: %m"); - if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->bus_fd, &ev) < 0) - goto fail; + r = sd_bus_attach_event(m->bus, m->event, SD_EVENT_PRIORITY_NORMAL); + if (r < 0) + return log_error_errno(r, "Failed to attach bus to event loop: %m"); return 0; +} -fail: - dbus_error_free(&error); +static int manager_vt_switch(sd_event_source *src, const struct signalfd_siginfo *si, void *data) { + Manager *m = data; + Session *active, *iter; + + /* + * We got a VT-switch signal and we have to acknowledge it immediately. + * Preferably, we'd just use m->seat0->active->vtfd, but unfortunately, + * old user-space might run multiple sessions on a single VT, *sigh*. + * Therefore, we have to iterate all sessions and find one with a vtfd + * on the requested VT. + * As only VTs with active controllers have VT_PROCESS set, our current + * notion of the active VT might be wrong (for instance if the switch + * happens while we setup VT_PROCESS). Therefore, read the current VT + * first and then use s->active->vtnr as reference. Note that this is + * not racy, as no further VT-switch can happen as long as we're in + * synchronous VT_PROCESS mode. + */ + + assert(m->seat0); + seat_read_active_vt(m->seat0); + + active = m->seat0->active; + if (!active || active->vtnr < 1) { + log_warning("Received VT_PROCESS signal without a registered session on that VT."); + return 0; + } - return r; + if (active->vtfd >= 0) { + session_leave_vt(active); + } else { + LIST_FOREACH(sessions_by_seat, iter, m->seat0->sessions) { + if (iter->vtnr == active->vtnr && iter->vtfd >= 0) { + session_leave_vt(iter); + break; + } + } + } + + return 0; } static int manager_connect_console(Manager *m) { - struct epoll_event ev; + int r; assert(m); assert(m->console_active_fd < 0); @@ -1036,89 +895,151 @@ static int manager_connect_console(Manager *m) { /* On certain architectures (S390 and Xen, and containers), /dev/tty0 does not exist, so don't fail if we can't open it. */ - if (access("/dev/tty0", F_OK) < 0) { - m->console_active_fd = -1; + if (access("/dev/tty0", F_OK) < 0) return 0; - } m->console_active_fd = open("/sys/class/tty/tty0/active", O_RDONLY|O_NOCTTY|O_CLOEXEC); if (m->console_active_fd < 0) { - log_error("Failed to open /sys/class/tty/tty0/active: %m"); - return -errno; + + /* On some systems the device node /dev/tty0 may exist + * even though /sys/class/tty/tty0 does not. */ + if (errno == ENOENT) + return 0; + + return log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m"); + } + + r = sd_event_add_io(m->event, &m->console_active_event_source, m->console_active_fd, 0, manager_dispatch_console, m); + if (r < 0) { + log_error("Failed to watch foreground console"); + return r; } - zero(ev); - ev.events = 0; - ev.data.u32 = FD_CONSOLE; + /* + * SIGRTMIN is used as global VT-release signal, SIGRTMIN + 1 is used + * as VT-acquire signal. We ignore any acquire-events (yes, we still + * have to provide a valid signal-number for it!) and acknowledge all + * release events immediately. + */ - if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->console_active_fd, &ev) < 0) - return -errno; + if (SIGRTMIN + 1 > SIGRTMAX) { + log_error("Not enough real-time signals available: %u-%u", SIGRTMIN, SIGRTMAX); + return -EINVAL; + } + + assert_se(ignore_signals(SIGRTMIN + 1, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGRTMIN, -1) >= 0); + + r = sd_event_add_signal(m->event, NULL, SIGRTMIN, manager_vt_switch, m); + if (r < 0) + return r; return 0; } static int manager_connect_udev(Manager *m) { - struct epoll_event ev; int r; assert(m); assert(!m->udev_seat_monitor); + assert(!m->udev_device_monitor); assert(!m->udev_vcsa_monitor); + assert(!m->udev_button_monitor); m->udev_seat_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); if (!m->udev_seat_monitor) return -ENOMEM; - r = udev_monitor_filter_add_match_tag(m->udev_seat_monitor, "seat"); + r = udev_monitor_filter_add_match_tag(m->udev_seat_monitor, "master-of-seat"); if (r < 0) return r; - r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_seat_monitor, "graphics", NULL); + r = udev_monitor_enable_receiving(m->udev_seat_monitor); if (r < 0) return r; - r = udev_monitor_enable_receiving(m->udev_seat_monitor); + r = sd_event_add_io(m->event, &m->udev_seat_event_source, udev_monitor_get_fd(m->udev_seat_monitor), EPOLLIN, manager_dispatch_seat_udev, m); if (r < 0) return r; - m->udev_seat_fd = udev_monitor_get_fd(m->udev_seat_monitor); - - zero(ev); - ev.events = EPOLLIN; - ev.data.u32 = FD_SEAT_UDEV; + m->udev_device_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); + if (!m->udev_device_monitor) + return -ENOMEM; - /* Don't bother watching VCSA devices, if nobody cares */ - if (m->n_autovts <= 0 || m->console_active_fd < 0) - return 0; + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_device_monitor, "input", NULL); + if (r < 0) + return r; - if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_seat_fd, &ev) < 0) - return -errno; + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_device_monitor, "graphics", NULL); + if (r < 0) + return r; - m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); - if (!m->udev_vcsa_monitor) - return -ENOMEM; + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_device_monitor, "drm", NULL); + if (r < 0) + return r; - r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_vcsa_monitor, "vc", NULL); + r = udev_monitor_enable_receiving(m->udev_device_monitor); if (r < 0) return r; - r = udev_monitor_enable_receiving(m->udev_vcsa_monitor); + r = sd_event_add_io(m->event, &m->udev_device_event_source, udev_monitor_get_fd(m->udev_device_monitor), EPOLLIN, manager_dispatch_device_udev, m); if (r < 0) return r; - m->udev_vcsa_fd = udev_monitor_get_fd(m->udev_vcsa_monitor); + /* Don't watch keys if nobody cares */ + if (m->handle_power_key != HANDLE_IGNORE || + m->handle_suspend_key != HANDLE_IGNORE || + m->handle_hibernate_key != HANDLE_IGNORE || + m->handle_lid_switch != HANDLE_IGNORE || + m->handle_lid_switch_docked != HANDLE_IGNORE) { - zero(ev); - ev.events = EPOLLIN; - ev.data.u32 = FD_VCSA_UDEV; + m->udev_button_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); + if (!m->udev_button_monitor) + return -ENOMEM; - if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_vcsa_fd, &ev) < 0) - return -errno; + r = udev_monitor_filter_add_match_tag(m->udev_button_monitor, "power-switch"); + if (r < 0) + return r; + + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_button_monitor, "input", NULL); + if (r < 0) + return r; + + r = udev_monitor_enable_receiving(m->udev_button_monitor); + if (r < 0) + return r; + + r = sd_event_add_io(m->event, &m->udev_button_event_source, udev_monitor_get_fd(m->udev_button_monitor), EPOLLIN, manager_dispatch_button_udev, m); + if (r < 0) + return r; + } + + /* Don't bother watching VCSA devices, if nobody cares */ +#if 0 /// elogind does not support autospawning of vts + if (m->n_autovts > 0 && m->console_active_fd >= 0) { + + m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); + if (!m->udev_vcsa_monitor) + return -ENOMEM; + + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_vcsa_monitor, "vc", NULL); + if (r < 0) + return r; + + r = udev_monitor_enable_receiving(m->udev_vcsa_monitor); + if (r < 0) + return r; + + r = sd_event_add_io(m->event, &m->udev_vcsa_event_source, udev_monitor_get_fd(m->udev_vcsa_monitor), EPOLLIN, manager_dispatch_vcsa_udev, m); + if (r < 0) + return r; + } +#endif // 0 return 0; } -void manager_gc(Manager *m, bool drop_not_started) { +static void manager_gc(Manager *m, bool drop_not_started) { Seat *seat; Session *session; User *user; @@ -1126,92 +1047,162 @@ void manager_gc(Manager *m, bool drop_not_started) { assert(m); while ((seat = m->seat_gc_queue)) { - LIST_REMOVE(Seat, gc_queue, m->seat_gc_queue, seat); + LIST_REMOVE(gc_queue, m->seat_gc_queue, seat); seat->in_gc_queue = false; - if (seat_check_gc(seat, drop_not_started) == 0) { - seat_stop(seat); + if (!seat_check_gc(seat, drop_not_started)) { + seat_stop(seat, false); seat_free(seat); } } while ((session = m->session_gc_queue)) { - LIST_REMOVE(Session, gc_queue, m->session_gc_queue, session); + LIST_REMOVE(gc_queue, m->session_gc_queue, session); session->in_gc_queue = false; - if (session_check_gc(session, drop_not_started) == 0) { - session_stop(session); + /* First, if we are not closing yet, initiate stopping */ + if (!session_check_gc(session, drop_not_started) && + session_get_state(session) != SESSION_CLOSING) + session_stop(session, false); + + /* Normally, this should make the session referenced + * again, if it doesn't then let's get rid of it + * immediately */ + if (!session_check_gc(session, drop_not_started)) { + session_finalize(session); session_free(session); } } while ((user = m->user_gc_queue)) { - LIST_REMOVE(User, gc_queue, m->user_gc_queue, user); + LIST_REMOVE(gc_queue, m->user_gc_queue, user); user->in_gc_queue = false; - if (user_check_gc(user, drop_not_started) == 0) { - user_stop(user); + /* First step: queue stop jobs */ + if (!user_check_gc(user, drop_not_started)) + user_stop(user, false); + + /* Second step: finalize user */ + if (!user_check_gc(user, drop_not_started)) { + user_finalize(user); user_free(user); } } } -int manager_get_idle_hint(Manager *m, dual_timestamp *t) { - Session *s; - bool idle_hint; - dual_timestamp ts = { 0, 0 }; - Iterator i; +static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *userdata) { + Manager *m = userdata; + struct dual_timestamp since; + usec_t n, elapse; + int r; assert(m); - idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t); + if (m->idle_action == HANDLE_IGNORE || + m->idle_action_usec <= 0) + return 0; + + n = now(CLOCK_MONOTONIC); - HASHMAP_FOREACH(s, m->sessions, i) { - dual_timestamp k; - int ih; + r = manager_get_idle_hint(m, &since); + if (r <= 0) + /* Not idle. Let's check if after a timeout it might be idle then. */ + elapse = n + m->idle_action_usec; + else { + /* Idle! Let's see if it's time to do something, or if + * we shall sleep for longer. */ + + if (n >= since.monotonic + m->idle_action_usec && + (m->idle_action_not_before_usec <= 0 || n >= m->idle_action_not_before_usec + m->idle_action_usec)) { + log_info("System idle. Taking action."); + + manager_handle_action(m, 0, m->idle_action, false, false); + m->idle_action_not_before_usec = n; + } - ih = session_get_idle_hint(s, &k); - if (ih < 0) - return ih; + elapse = MAX(since.monotonic, m->idle_action_not_before_usec) + m->idle_action_usec; + } - if (!ih) { - if (!idle_hint) { - if (k.monotonic < ts.monotonic) - ts = k; - } else { - idle_hint = false; - ts = k; - } - } else if (idle_hint) { + if (!m->idle_action_event_source) { - if (k.monotonic > ts.monotonic) - ts = k; - } + r = sd_event_add_time( + m->event, + &m->idle_action_event_source, + CLOCK_MONOTONIC, + elapse, USEC_PER_SEC*30, + manager_dispatch_idle_action, m); + if (r < 0) + return log_error_errno(r, "Failed to add idle event source: %m"); + + r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10); + if (r < 0) + return log_error_errno(r, "Failed to set idle event source priority: %m"); + } else { + r = sd_event_source_set_time(m->idle_action_event_source, elapse); + if (r < 0) + return log_error_errno(r, "Failed to set idle event timer: %m"); + + r = sd_event_source_set_enabled(m->idle_action_event_source, SD_EVENT_ONESHOT); + if (r < 0) + return log_error_errno(r, "Failed to enable idle event timer: %m"); } - if (t) - *t = ts; + return 0; +} + +static int manager_parse_config_file(Manager *m) { +#if 0 /// elogind parses its own config file + assert(m); + + return config_parse_many(PKGSYSCONFDIR "/logind.conf", + CONF_PATHS_NULSTR("systemd/logind.conf.d"), + "Login\0", + config_item_perf_lookup, logind_gperf_lookup, + false, m); +#else + const char* logind_conf = getenv("ELOGIND_CONF_FILE"); + + assert(m); + + if (!logind_conf) + logind_conf = PKGSYSCONFDIR "/logind.conf"; - return idle_hint; + return config_parse(NULL, logind_conf, NULL, "Login\0Sleep\0", + config_item_perf_lookup, logind_gperf_lookup, + false, false, true, m); +#endif // 0 } -int manager_startup(Manager *m) { +static int manager_dispatch_reload_signal(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) { + Manager *m = userdata; + int r; + + manager_reset_config(m); + r = manager_parse_config_file(m); + if (r < 0) + log_warning_errno(r, "Failed to parse config file, using defaults: %m"); + else + log_info("Config file reloaded."); + + return 0; +} + +static int manager_startup(Manager *m) { int r; Seat *seat; Session *session; User *user; + Button *button; Inhibitor *inhibitor; Iterator i; assert(m); - assert(m->epoll_fd <= 0); - cg_shorten_controllers(m->reset_controllers); - cg_shorten_controllers(m->controllers); + assert_se(sigprocmask_many(SIG_SETMASK, NULL, SIGHUP, -1) >= 0); - m->epoll_fd = epoll_create1(EPOLL_CLOEXEC); - if (m->epoll_fd < 0) - return -errno; + r = sd_event_add_signal(m->event, NULL, SIGHUP, manager_dispatch_reload_signal, m); + if (r < 0) + return log_error_errno(r, "Failed to register SIGHUP handler: %m"); /* Connect to console */ r = manager_connect_console(m); @@ -1221,7 +1212,7 @@ int manager_startup(Manager *m) { /* Connect to udev */ r = manager_connect_udev(m); if (r < 0) - return r; + return log_error_errno(r, "Failed to create udev watchers: %m"); /* Connect to the bus */ r = manager_connect_bus(m); @@ -1229,20 +1220,47 @@ int manager_startup(Manager *m) { return r; /* Instantiate magic seat 0 */ - r = manager_add_seat(m, "seat0", &m->vtconsole); + r = manager_add_seat(m, "seat0", &m->seat0); if (r < 0) - return r; + return log_error_errno(r, "Failed to add seat0: %m"); + + r = manager_set_lid_switch_ignore(m, 0 + m->holdoff_timeout_usec); + if (r < 0) + log_warning_errno(r, "Failed to set up lid switch ignore event source: %m"); /* Deserialize state */ - manager_enumerate_devices(m); - manager_enumerate_seats(m); - manager_enumerate_users(m); - manager_enumerate_sessions(m); - manager_enumerate_inhibitors(m); + r = manager_enumerate_devices(m); + if (r < 0) + log_warning_errno(r, "Device enumeration failed: %m"); + + r = manager_enumerate_seats(m); + if (r < 0) + log_warning_errno(r, "Seat enumeration failed: %m"); + + r = manager_enumerate_users(m); + if (r < 0) + log_warning_errno(r, "User enumeration failed: %m"); + + r = manager_enumerate_sessions(m); + if (r < 0) + log_warning_errno(r, "Session enumeration failed: %m"); + + r = manager_enumerate_inhibitors(m); + if (r < 0) + log_warning_errno(r, "Inhibitor enumeration failed: %m"); + + r = manager_enumerate_buttons(m); + if (r < 0) + log_warning_errno(r, "Button enumeration failed: %m"); /* Remove stale objects before we start them */ manager_gc(m, false); + /* Reserve the special reserved VT */ +#if 0 /// elogind does not support autospawning of vts + manager_reserve_vt(m); +#endif // 0 + /* And start everything */ HASHMAP_FOREACH(seat, m->seats, i) seat_start(seat); @@ -1256,110 +1274,54 @@ int manager_startup(Manager *m) { HASHMAP_FOREACH(inhibitor, m->inhibitors, i) inhibitor_start(inhibitor); - return 0; -} - -int manager_run(Manager *m) { - assert(m); - - for (;;) { - struct epoll_event event; - int n; - int msec = -1; - - manager_gc(m, true); - - if (manager_dispatch_delayed(m) > 0) - continue; - - if (dbus_connection_dispatch(m->bus) != DBUS_DISPATCH_COMPLETE) - continue; - - manager_gc(m, true); + HASHMAP_FOREACH(button, m->buttons, i) + button_check_switches(button); - if (m->delayed_unit) { - usec_t x, y; - - x = now(CLOCK_MONOTONIC); - y = m->delayed_timestamp + m->inhibit_delay_max; - - msec = x >= y ? 0 : (int) ((y - x) / USEC_PER_MSEC); - } - - n = epoll_wait(m->epoll_fd, &event, 1, msec); - if (n < 0) { - if (errno == EINTR || errno == EAGAIN) - continue; - - log_error("epoll() failed: %m"); - return -errno; - } - - if (n == 0) - continue; - - switch (event.data.u32) { - - case FD_SEAT_UDEV: - manager_dispatch_seat_udev(m); - break; - - case FD_VCSA_UDEV: - manager_dispatch_vcsa_udev(m); - break; - - case FD_CONSOLE: - manager_dispatch_console(m); - break; - - case FD_BUS: - bus_loop_dispatch(m->bus_fd); - break; - - default: - if (event.data.u32 >= FD_FIFO_BASE) - manager_pipe_notify_eof(m, event.data.u32 - FD_FIFO_BASE); - } - } + manager_dispatch_idle_action(NULL, 0, m); return 0; } -static int manager_parse_config_file(Manager *m) { - FILE *f; - const char *fn; +static int manager_run(Manager *m) { int r; assert(m); - fn = "/etc/systemd/logind.conf"; - f = fopen(fn, "re"); - if (!f) { - if (errno == ENOENT) + for (;;) { + r = sd_event_get_state(m->event); + if (r < 0) + return r; + if (r == SD_EVENT_FINISHED) return 0; - log_warning("Failed to open configuration file %s: %m", fn); - return -errno; - } - - r = config_parse(fn, f, "Login\0", config_item_perf_lookup, (void*) logind_gperf_lookup, false, m); - if (r < 0) - log_warning("Failed to parse configuration file: %s", strerror(-r)); + manager_gc(m, true); - fclose(f); + r = manager_dispatch_delayed(m, false); + if (r < 0) + return r; + if (r > 0) + continue; - return r; + r = sd_event_run(m->event, (uint64_t) -1); + if (r < 0) + return r; + } } int main(int argc, char *argv[]) { Manager *m = NULL; int r; + elogind_set_program_name(argv[0]); log_set_target(LOG_TARGET_AUTO); log_set_facility(LOG_AUTH); log_parse_environment(); log_open(); +#ifdef ENABLE_DEBUG_ELOGIND + log_set_max_level(LOG_DEBUG); +#endif // ENABLE_DEBUG_ELOGIND + umask(0022); if (argc != 1) { @@ -1368,10 +1330,42 @@ int main(int argc, char *argv[]) { goto finish; } + r = mac_selinux_init(); + if (r < 0) { + log_error_errno(r, "Could not initialize labelling: %m"); + goto finish; + } + + /* Always create the directories people can create inotify + * watches in. Note that some applications might check for the + * existence of /run/systemd/seats/ to determine whether + * logind is available, so please always make sure this check + * stays in. */ +#if 0 /// elogind can not rely on systemd to help, so we need a bit more effort than this + mkdir_label("/run/systemd/seats", 0755); + mkdir_label("/run/systemd/users", 0755); + mkdir_label("/run/systemd/sessions", 0755); +#else + r = mkdir_label("/run/systemd", 0755); + if ( (r < 0) && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd : %m"); + r = mkdir_label("/run/systemd/seats", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/seats : %m"); + r = mkdir_label("/run/systemd/users", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/users : %m"); + r = mkdir_label("/run/systemd/sessions", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/sessions : %m"); + r = mkdir_label("/run/systemd/machines", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/machines : %m"); +#endif // 0 + m = manager_new(); if (!m) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -1379,11 +1373,11 @@ int main(int argc, char *argv[]) { r = manager_startup(m); if (r < 0) { - log_error("Failed to fully start up daemon: %s", strerror(-r)); + log_error_errno(r, "Failed to fully start up daemon: %m"); goto finish; } - log_debug("systemd-logind running as pid %lu", (unsigned long) getpid()); + log_debug("elogind running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -1391,10 +1385,11 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("systemd-logind stopped as pid %lu", (unsigned long) getpid()); + log_debug("elogind stopped as pid "PID_FMT, getpid()); finish: sd_notify(false, + "STOPPING=1\n" "STATUS=Shutting down..."); if (m)