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=8997b4689ed1a0d1a332401d4e6c5d0f3699a98d;hb=7b77ed8cf36e8eca6017791626044b61ae2d68e7;hpb=9b221b63e5cc62439b32bb487775856a78c6015a
diff --git a/src/login/logind.c b/src/login/logind.c
index 8997b4689..b7c8f71a5 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -6,66 +6,81 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
#include
-#include
#include
#include
#include
#include
-#include
-#include
#include
+#include
-#include
-
-#include "logind.h"
-#include "dbus-common.h"
-#include "dbus-loop.h"
+#include "sd-daemon.h"
#include "strv.h"
#include "conf-parser.h"
+#include "mkdir.h"
+#include "bus-util.h"
+#include "bus-error.h"
+#include "logind.h"
+#include "udev-util.h"
Manager *manager_new(void) {
Manager *m;
+ int r;
m = new0(Manager, 1);
if (!m)
return NULL;
m->console_active_fd = -1;
- m->bus_fd = -1;
- m->udev_seat_fd = -1;
- m->udev_vcsa_fd = -1;
- m->epoll_fd = -1;
+ m->reserve_vt_fd = -1;
+
m->n_autovts = 6;
+ m->reserve_vt = 6;
+ 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->lid_switch_ignore_inhibited = true;
+
+ m->idle_action_usec = 30 * USEC_PER_MINUTE;
+ m->idle_action = HANDLE_IGNORE;
+ m->idle_action_not_before_usec = now(CLOCK_MONOTONIC);
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->cgroups = hashmap_new(string_hash_func, string_compare_func);
- m->fifo_fds = hashmap_new(trivial_hash_func, trivial_compare_func);
+ m->inhibitors = hashmap_new(string_hash_func, string_compare_func);
+ m->buttons = hashmap_new(string_hash_func, string_compare_func);
+
+ m->user_units = hashmap_new(string_hash_func, string_compare_func);
+ m->session_units = hashmap_new(string_hash_func, string_compare_func);
- if (!m->devices || !m->seats || !m->sessions || !m->users || !m->cgroups || !m->fifo_fds) {
+ m->busnames = set_new(string_hash_func, string_compare_func);
+
+ if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames ||
+ !m->user_units || !m->session_units ||
+ !m->busnames) {
manager_free(m);
return NULL;
}
- m->reset_controllers = strv_new("cpu", NULL);
m->kill_exclude_users = strv_new("root", NULL);
- if (!m->reset_controllers || !m->kill_exclude_users) {
+ if (!m->kill_exclude_users) {
manager_free(m);
return NULL;
}
@@ -76,11 +91,14 @@ Manager *manager_new(void) {
return NULL;
}
- if (cg_get_user_path(&m->cgroup_path) < 0) {
+ r = sd_event_default(&m->event);
+ if (r < 0) {
manager_free(m);
return NULL;
}
+ sd_event_set_watchdog(m->event, true);
+
return m;
}
@@ -89,6 +107,8 @@ void manager_free(Manager *m) {
User *u;
Device *d;
Seat *s;
+ Inhibitor *i;
+ Button *b;
assert(m);
@@ -104,226 +124,125 @@ void manager_free(Manager *m) {
while ((s = hashmap_first(m->seats)))
seat_free(s);
- hashmap_free(m->sessions);
- hashmap_free(m->users);
+ 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->cgroups);
- hashmap_free(m->fifo_fds);
+ hashmap_free(m->sessions);
+ hashmap_free(m->users);
+ hashmap_free(m->inhibitors);
+ hashmap_free(m->buttons);
+
+ hashmap_free(m->user_units);
+ hashmap_free(m->session_units);
+
+ set_free_free(m->busnames);
+
+ sd_event_source_unref(m->idle_action_event_source);
+
+ 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);
if (m->console_active_fd >= 0)
close_nointr_nofail(m->console_active_fd);
if (m->udev_seat_monitor)
udev_monitor_unref(m->udev_seat_monitor);
-
+ if (m->udev_device_monitor)
+ udev_monitor_unref(m->udev_device_monitor);
if (m->udev_vcsa_monitor)
udev_monitor_unref(m->udev_vcsa_monitor);
+ if (m->udev_button_monitor)
+ udev_monitor_unref(m->udev_button_monitor);
if (m->udev)
udev_unref(m->udev);
- if (m->bus) {
- dbus_connection_flush(m->bus);
- dbus_connection_close(m->bus);
- dbus_connection_unref(m->bus);
- }
+ bus_verify_polkit_async_registry_free(m->bus, m->polkit_registry);
- if (m->bus_fd >= 0)
- close_nointr_nofail(m->bus_fd);
+ sd_bus_unref(m->bus);
+ sd_event_unref(m->event);
- if (m->epoll_fd >= 0)
- close_nointr_nofail(m->epoll_fd);
+ if (m->reserve_vt_fd >= 0)
+ close_nointr_nofail(m->reserve_vt_fd);
- strv_free(m->controllers);
- strv_free(m->reset_controllers);
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
- free(m->cgroup_path);
+ free(m->action_job);
free(m);
}
-int manager_add_device(Manager *m, const char *sysfs, Device **_device) {
- Device *d;
-
- assert(m);
- assert(sysfs);
-
- d = hashmap_get(m->devices, sysfs);
- if (d) {
- if (_device)
- *_device = d;
-
- return 0;
- }
-
- d = device_new(m, sysfs);
- if (!d)
- return -ENOMEM;
-
- if (_device)
- *_device = d;
-
- return 0;
-}
-
-int manager_add_seat(Manager *m, const char *id, Seat **_seat) {
- Seat *s;
-
- assert(m);
- assert(id);
-
- s = hashmap_get(m->seats, id);
- if (s) {
- if (_seat)
- *_seat = s;
-
- return 0;
- }
-
- s = seat_new(m, id);
- if (!s)
- return -ENOMEM;
-
- if (_seat)
- *_seat = s;
-
- return 0;
-}
-
-int manager_add_session(Manager *m, User *u, const char *id, Session **_session) {
- Session *s;
-
- assert(m);
- assert(id);
-
- s = hashmap_get(m->sessions, id);
- if (s) {
- if (_session)
- *_session = s;
-
- return 0;
- }
-
- s = session_new(m, u, id);
- if (!s)
- return -ENOMEM;
-
- if (_session)
- *_session = s;
-
- return 0;
-}
-
-int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **_user) {
- User *u;
+static int manager_enumerate_devices(Manager *m) {
+ struct udev_list_entry *item = NULL, *first = NULL;
+ struct udev_enumerate *e;
+ int r;
assert(m);
- assert(name);
- u = hashmap_get(m->users, ULONG_TO_PTR((unsigned long) uid));
- if (u) {
- if (_user)
- *_user = u;
+ /* Loads devices from udev and creates seats for them as
+ * necessary */
- return 0;
+ e = udev_enumerate_new(m->udev);
+ if (!e) {
+ r = -ENOMEM;
+ goto finish;
}
- u = user_new(m, uid, gid, name);
- if (!u)
- 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_tag(e, "master-of-seat");
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_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);
+ goto finish;
- } else {
- const char *sn;
- Seat *seat;
+ r = udev_enumerate_scan_devices(e);
+ if (r < 0)
+ goto finish;
- sn = udev_device_get_property_value(d, "ID_SEAT");
- if (isempty(sn))
- sn = "seat0";
+ first = udev_enumerate_get_list_entry(e);
+ udev_list_entry_foreach(item, first) {
+ struct udev_device *d;
+ int k;
- if (!seat_name_is_valid(sn)) {
- log_warning("Device with invalid seat name %s found, ignoring.", sn);
- return 0;
+ d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
+ if (!d) {
+ r = -ENOMEM;
+ goto finish;
}
- 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;
- }
+ k = manager_process_seat_device(m, d);
+ udev_device_unref(d);
- device_attach(device, seat);
- seat_start(seat);
+ if (k < 0)
+ r = k;
}
- return 0;
+finish:
+ if (e)
+ udev_enumerate_unref(e);
+
+ return r;
}
-int manager_enumerate_devices(Manager *m) {
+static int manager_enumerate_buttons(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 */
+ /* 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)
+ return 0;
e = udev_enumerate_new(m->udev);
if (!e) {
@@ -331,11 +250,11 @@ int manager_enumerate_devices(Manager *m) {
goto finish;
}
- r = udev_enumerate_add_match_subsystem(e, "graphics");
+ r = udev_enumerate_add_match_subsystem(e, "input");
if (r < 0)
goto finish;
- r = udev_enumerate_add_match_tag(e, "seat");
+ r = udev_enumerate_add_match_tag(e, "power-switch");
if (r < 0)
goto finish;
@@ -354,7 +273,7 @@ int manager_enumerate_devices(Manager *m) {
goto finish;
}
- k = manager_process_seat_device(m, d);
+ k = manager_process_button_device(m, d);
udev_device_unref(d);
if (k < 0)
@@ -368,8 +287,8 @@ finish:
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;
@@ -388,7 +307,7 @@ int manager_enumerate_seats(Manager *m) {
return -errno;
}
- while ((de = readdir(d))) {
+ FOREACH_DIRENT(de, d, return -errno) {
Seat *s;
int k;
@@ -406,61 +325,16 @@ int manager_enumerate_seats(Manager *m) {
r = k;
}
- closedir(d);
-
- return r;
-}
-
-static int manager_enumerate_users_from_cgroup(Manager *m) {
- int r = 0;
- char *name;
- DIR *d;
- int k;
-
- 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)
@@ -470,7 +344,7 @@ static int manager_enumerate_linger_users(Manager *m) {
return -errno;
}
- while ((de = readdir(d))) {
+ FOREACH_DIRENT(de, d, return -errno) {
int k;
if (!dirent_is_file(de))
@@ -483,27 +357,20 @@ static int manager_enumerate_linger_users(Manager *m) {
}
}
- 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);
-
- /* Second, add lingering users on top */
- k = manager_enumerate_linger_users(m);
- if (k < 0)
- r = k;
+ /* Add lingering users */
+ r = manager_enumerate_linger_users(m);
- /* 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)
@@ -513,84 +380,71 @@ int manager_enumerate_users(Manager *m) {
return -errno;
}
- 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("Failed to add user by file name %s: %s", de->d_name, strerror(-k));
- 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;
+
+ log_error("Failed to open /run/systemd/sessions: %m");
+ return -errno;
+ }
+
+ 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("Failed to add session by file name %s: %s", de->d_name, strerror(-k));
- free(name);
+ r = k;
+ continue;
}
- closedir(d);
+ session_add_to_gc_queue(s);
+ k = session_load(s);
if (k < 0)
r = k;
}
@@ -598,52 +452,47 @@ 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");
+ log_error("Failed to open /run/systemd/inhibit: %m");
return -errno;
}
- 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("Couldn't add inhibitor %s: %s", de->d_name, strerror(-k));
+ r = k;
continue;
}
- k = session_load(s);
+ k = inhibitor_load(i);
if (k < 0)
r = k;
}
- closedir(d);
-
return r;
}
-int manager_dispatch_seat_udev(Manager *m) {
- struct udev_device *d;
- int r;
+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);
@@ -651,15 +500,27 @@ int manager_dispatch_seat_udev(Manager *m) {
if (!d)
return -ENOMEM;
- r = manager_process_seat_device(m, d);
- udev_device_unref(d);
+ manager_process_seat_device(m, d);
+ return 0;
+}
- return 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_device_monitor);
+ if (!d)
+ return -ENOMEM;
+
+ manager_process_seat_device(m, d);
+ return 0;
}
-int manager_dispatch_vcsa_udev(Manager *m) {
- struct udev_device *d;
- int r = 0;
+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);
@@ -674,276 +535,218 @@ 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;
}
-int manager_dispatch_console(Manager *m) {
+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;
+
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;
+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;
+ if (asprintf(&p, "/dev/tty%u", m->reserve_vt) < 0)
+ return log_oom();
- 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;
- }
+ m->reserve_vt_fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK);
+ if (m->reserve_vt_fd < 0) {
- if (asprintf(&name, "autovt@tty%i.service", vtnr) < 0) {
- log_error("Could not allocate service name.");
- r = -ENOMEM;
- goto finish;
- }
-
- 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;
- }
-
- 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("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;
}
-int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session) {
- char *p;
+static int manager_connect_bus(Manager *m) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ int r;
assert(m);
- assert(cgroup);
- assert(session);
+ assert(!m->bus);
- p = strdup(cgroup);
- if (!p) {
- log_error("Out of memory.");
- return -ENOMEM;
+ r = sd_bus_default_system(&m->bus);
+ if (r < 0) {
+ log_error("Failed to connect to system bus: %s", strerror(-r));
+ return r;
}
- for (;;) {
- Session *s;
- char *e;
-
- if (isempty(p) || streq(p, "/")) {
- free(p);
- *session = NULL;
- return 0;
- }
-
- s = hashmap_get(m->cgroups, p);
- if (s) {
- free(p);
- *session = s;
- return 1;
- }
-
- assert_se(e = strrchr(p, '/'));
- *e = 0;
+ r = sd_bus_add_object_vtable(m->bus, "/org/freedesktop/login1", "org.freedesktop.login1.Manager", manager_vtable, m);
+ if (r < 0) {
+ log_error("Failed to add manager object vtable: %s", strerror(-r));
+ return r;
}
-}
-
-int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
- char *p;
- int r;
- assert(m);
- assert(pid >= 1);
- assert(session);
-
- r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &p);
- if (r < 0)
+ r = sd_bus_add_fallback_vtable(m->bus, "/org/freedesktop/login1/seat", "org.freedesktop.login1.Seat", seat_vtable, seat_object_find, m);
+ if (r < 0) {
+ log_error("Failed to add seat object vtable: %s", strerror(-r));
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);
-}
-
-static void manager_pipe_notify_eof(Manager *m, int fd) {
- Session *s;
-
- assert_se(m);
- assert_se(fd >= 0);
-
- assert_se(s = hashmap_get(m->fifo_fds, INT_TO_PTR(fd + 1)));
- assert(s->fifo_fd == fd);
- session_remove_fifo(s);
+ r = sd_bus_add_node_enumerator(m->bus, "/org/freedesktop/login1/seat", seat_node_enumerator, m);
+ if (r < 0) {
+ log_error("Failed to add seat enumerator: %s", strerror(-r));
+ return r;
+ }
- session_stop(s);
-}
+ r = sd_bus_add_fallback_vtable(m->bus, "/org/freedesktop/login1/session", "org.freedesktop.login1.Session", session_vtable, session_object_find, m);
+ if (r < 0) {
+ log_error("Failed to add session object vtable: %s", strerror(-r));
+ return r;
+ }
-static int manager_connect_bus(Manager *m) {
- DBusError error;
- int r;
- struct epoll_event ev;
+ r = sd_bus_add_node_enumerator(m->bus, "/org/freedesktop/login1/session", session_node_enumerator, m);
+ if (r < 0) {
+ log_error("Failed to add session enumerator: %s", strerror(-r));
+ return r;
+ }
- assert(m);
- assert(!m->bus);
- assert(m->bus_fd < 0);
+ r = sd_bus_add_fallback_vtable(m->bus, "/org/freedesktop/login1/user", "org.freedesktop.login1.User", user_vtable, user_object_find, m);
+ if (r < 0) {
+ log_error("Failed to add user object vtable: %s", strerror(-r));
+ return r;
+ }
- dbus_error_init(&error);
+ r = sd_bus_add_node_enumerator(m->bus, "/org/freedesktop/login1/user", user_node_enumerator, m);
+ if (r < 0) {
+ log_error("Failed to add user enumerator: %s", strerror(-r));
+ return r;
+ }
- 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_add_match(m->bus,
+ "type='signal',"
+ "sender='org.freedesktop.DBus',"
+ "interface='org.freedesktop.DBus',"
+ "member='NameOwnerChanged',"
+ "path='/org/freedesktop/DBus'",
+ match_name_owner_changed, m);
+ if (r < 0) {
+ log_error("Failed to add match for NameOwnerChanged: %s", strerror(-r));
+ return r;
}
- 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_match(m->bus,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.systemd1.Manager',"
+ "member='JobRemoved',"
+ "path='/org/freedesktop/systemd1'",
+ match_job_removed, m);
+ if (r < 0) {
+ log_error("Failed to add match for JobRemoved: %s", strerror(-r));
+ return r;
}
- dbus_bus_add_match(m->bus,
- "type='signal',"
- "interface='org.freedesktop.systemd1.Agent',"
- "member='Released',"
- "path='/org/freedesktop/systemd1/agent'",
- &error);
-
- 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_match(m->bus,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.systemd1.Manager',"
+ "member='UnitRemoved',"
+ "path='/org/freedesktop/systemd1'",
+ match_unit_removed, m);
+ if (r < 0) {
+ log_error("Failed to add match for UnitRemoved: %s", strerror(-r));
+ return r;
}
- 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_match(m->bus,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.DBus.Properties',"
+ "member='PropertiesChanged'",
+ match_properties_changed, m);
+ if (r < 0) {
+ log_error("Failed to add match for PropertiesChanged: %s", strerror(-r));
+ return r;
}
- if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
- log_error("Failed to acquire name.");
- r = -EEXIST;
- goto fail;
+ r = sd_bus_add_match(m->bus,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.systemd1.Manager',"
+ "member='Reloading',"
+ "path='/org/freedesktop/systemd1'",
+ match_reloading, m);
+ if (r < 0) {
+ log_error("Failed to add match for Reloading: %s", strerror(-r));
+ return r;
}
- m->bus_fd = bus_loop_open(m->bus);
- if (m->bus_fd < 0) {
- r = m->bus_fd;
- goto fail;
+ 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;
}
- zero(ev);
- ev.events = EPOLLIN;
- ev.data.u32 = FD_BUS;
+ r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
+ if (r < 0) {
+ log_error("Failed to register name: %s", strerror(-r));
+ return r;
+ }
- 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, 0);
+ if (r < 0) {
+ log_error("Failed to attach bus to event loop: %s", strerror(-r));
+ return r;
+ }
return 0;
-
-fail:
- dbus_error_free(&error);
-
- return r;
}
static int manager_connect_console(Manager *m) {
- struct epoll_event ev;
+ int r;
assert(m);
assert(m->console_active_fd < 0);
+ /* 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)
+ return 0;
+
m->console_active_fd = open("/sys/class/tty/tty0/active", O_RDONLY|O_NOCTTY|O_CLOEXEC);
if (m->console_active_fd < 0) {
- /* On certain architectures (S390 and Xen), /dev/tty0
- does not exist, so don't fail if we can't open it.*/
+ /* On some systems the device node /dev/tty0 may exist
+ * even though /sys/class/tty/tty0 does not. */
if (errno == ENOENT)
return 0;
@@ -951,73 +754,110 @@ static int manager_connect_console(Manager *m) {
return -errno;
}
- zero(ev);
- ev.events = 0;
- ev.data.u32 = FD_CONSOLE;
-
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->console_active_fd, &ev) < 0)
- return -errno;
+ r = sd_event_add_io(m->event, m->console_active_fd, 0, manager_dispatch_console, m, &m->console_active_event_source);
+ if (r < 0) {
+ log_error("Failed to watch foreground console");
+ 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, udev_monitor_get_fd(m->udev_seat_monitor), EPOLLIN, manager_dispatch_seat_udev, m, &m->udev_seat_event_source);
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, udev_monitor_get_fd(m->udev_device_monitor), EPOLLIN, manager_dispatch_device_udev, m, &m->udev_device_event_source);
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) {
- 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, udev_monitor_get_fd(m->udev_button_monitor), EPOLLIN, manager_dispatch_button_udev, m, &m->udev_button_event_source);
+ if (r < 0)
+ return r;
+ }
+
+ /* Don't bother watching VCSA devices, if nobody cares */
+ 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, udev_monitor_get_fd(m->udev_vcsa_monitor), EPOLLIN, manager_dispatch_vcsa_udev, m, &m->udev_vcsa_event_source);
+ if (r < 0)
+ return r;
+ }
return 0;
}
@@ -1030,71 +870,99 @@ 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) {
+ if (!seat_check_gc(seat, drop_not_started)) {
seat_stop(seat);
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) {
+ if (!session_check_gc(session, drop_not_started)) {
session_stop(session);
+ 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) {
+ if (!user_check_gc(user, drop_not_started)) {
user_stop(user);
+ user_finalize(user);
user_free(user);
}
}
}
-int manager_get_idle_hint(Manager *m, dual_timestamp *t) {
- Session *s;
- bool idle_hint = true;
- 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);
- HASHMAP_FOREACH(s, m->sessions, i) {
- dual_timestamp k;
- int ih;
-
- ih = session_get_idle_hint(s, &k);
- if (ih < 0)
- return ih;
-
- if (!ih) {
- if (!idle_hint) {
- if (k.monotonic < ts.monotonic)
- ts = k;
- } else {
- idle_hint = false;
- ts = k;
- }
- } else if (idle_hint) {
-
- if (k.monotonic > ts.monotonic)
- ts = k;
+ if (m->idle_action == HANDLE_IGNORE ||
+ m->idle_action_usec <= 0)
+ return 0;
+
+ n = now(CLOCK_MONOTONIC);
+
+ 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;
}
+
+ elapse = MAX(since.monotonic, m->idle_action_not_before_usec) + m->idle_action_usec;
}
- if (t)
- *t = ts;
+ if (!m->idle_action_event_source) {
+
+ r = sd_event_add_monotonic(m->event, elapse, USEC_PER_SEC*30, manager_dispatch_idle_action, m, &m->idle_action_event_source);
+ if (r < 0) {
+ log_error("Failed to add idle event source: %s", strerror(-r));
+ return r;
+ }
+
+ r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10);
+ if (r < 0) {
+ log_error("Failed to set idle event source priority: %s", strerror(-r));
+ return r;
+ }
+ } else {
+ r = sd_event_source_set_time(m->idle_action_event_source, elapse);
+ if (r < 0) {
+ log_error("Failed to set idle event timer: %s", strerror(-r));
+ return r;
+ }
- return idle_hint;
+ r = sd_event_source_set_enabled(m->idle_action_event_source, SD_EVENT_ONESHOT);
+ if (r < 0) {
+ log_error("Failed to enable idle event timer: %s", strerror(-r));
+ return r;
+ }
+ }
+
+ return 0;
}
int manager_startup(Manager *m) {
@@ -1102,14 +970,10 @@ int manager_startup(Manager *m) {
Seat *seat;
Session *session;
User *user;
+ Inhibitor *inhibitor;
Iterator i;
assert(m);
- assert(m->epoll_fd <= 0);
-
- m->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
- if (m->epoll_fd < 0)
- return -errno;
/* Connect to console */
r = manager_connect_console(m);
@@ -1118,8 +982,10 @@ int manager_startup(Manager *m) {
/* Connect to udev */
r = manager_connect_udev(m);
- if (r < 0)
+ if (r < 0) {
+ log_error("Failed to create udev watchers: %s", strerror(-r));
return r;
+ }
/* Connect to the bus */
r = manager_connect_bus(m);
@@ -1127,19 +993,43 @@ int manager_startup(Manager *m) {
return r;
/* Instantiate magic seat 0 */
- r = manager_add_seat(m, "seat0", &m->vtconsole);
- if (r < 0)
+ r = manager_add_seat(m, "seat0", &m->seat0);
+ if (r < 0) {
+ log_error("Failed to add seat0: %s", strerror(-r));
return r;
+ }
/* Deserialize state */
- manager_enumerate_devices(m);
- manager_enumerate_seats(m);
- manager_enumerate_users(m);
- manager_enumerate_sessions(m);
+ r = manager_enumerate_devices(m);
+ if (r < 0)
+ log_warning("Device enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_seats(m);
+ if (r < 0)
+ log_warning("Seat enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_users(m);
+ if (r < 0)
+ log_warning("User enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_sessions(m);
+ if (r < 0)
+ log_warning("Session enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_inhibitors(m);
+ if (r < 0)
+ log_warning("Inhibitor enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_buttons(m);
+ if (r < 0)
+ log_warning("Button enumeration failed: %s", strerror(-r));
/* Remove stale objects before we start them */
manager_gc(m, false);
+ /* Reserve the special reserved VT */
+ manager_reserve_vt(m);
+
/* And start everything */
HASHMAP_FOREACH(seat, m->seats, i)
seat_start(seat);
@@ -1150,67 +1040,80 @@ int manager_startup(Manager *m) {
HASHMAP_FOREACH(session, m->sessions, i)
session_start(session);
+ HASHMAP_FOREACH(inhibitor, m->inhibitors, i)
+ inhibitor_start(inhibitor);
+
+ manager_dispatch_idle_action(NULL, 0, m);
+
return 0;
}
-int manager_run(Manager *m) {
+static int manager_recheck_buttons(Manager *m) {
+ Iterator i;
+ Button *b;
+ int r = 0;
+
assert(m);
- for (;;) {
- struct epoll_event event;
- int n;
+ HASHMAP_FOREACH(b, m->buttons, i) {
+ int q;
- manager_gc(m, true);
+ q = button_recheck(b);
+ if (q > 0)
+ return 1;
+ if (q < 0)
+ r = q;
+ }
- if (dbus_connection_dispatch(m->bus) != DBUS_DISPATCH_COMPLETE)
- continue;
+ return r;
+}
- manager_gc(m, true);
+int manager_run(Manager *m) {
+ int r;
- n = epoll_wait(m->epoll_fd, &event, 1, -1);
- if (n < 0) {
- if (errno == EINTR || errno == EAGAIN)
- continue;
+ assert(m);
- log_error("epoll() failed: %m");
- return -errno;
- }
+ for (;;) {
+ usec_t us = (uint64_t) -1;
- switch (event.data.u32) {
+ r = sd_event_get_state(m->event);
+ if (r < 0)
+ return r;
+ if (r == SD_EVENT_FINISHED)
+ return 0;
- case FD_SEAT_UDEV:
- manager_dispatch_seat_udev(m);
- break;
+ manager_gc(m, true);
+
+ if (manager_dispatch_delayed(m) > 0)
+ continue;
- case FD_VCSA_UDEV:
- manager_dispatch_vcsa_udev(m);
- break;
+ if (manager_recheck_buttons(m) > 0)
+ continue;
- case FD_CONSOLE:
- manager_dispatch_console(m);
- break;
+ if (m->action_what != 0 && !m->action_job) {
+ usec_t x, y;
- case FD_BUS:
- bus_loop_dispatch(m->bus_fd);
- break;
+ x = now(CLOCK_MONOTONIC);
+ y = m->action_timestamp + m->inhibit_delay_max;
- default:
- if (event.data.u32 >= FD_FIFO_BASE)
- manager_pipe_notify_eof(m, event.data.u32 - FD_FIFO_BASE);
+ us = x >= y ? 0 : y - x;
}
+
+ r = sd_event_run(m->event, us);
+ if (r < 0)
+ return r;
}
return 0;
}
static int manager_parse_config_file(Manager *m) {
- FILE *f;
- const char *fn;
+ static const char fn[] = "/etc/systemd/logind.conf";
+ _cleanup_fclose_ FILE *f = NULL;
int r;
assert(m);
- fn = "/etc/systemd/systemd-logind.conf";
f = fopen(fn, "re");
if (!f) {
if (errno == ENOENT)
@@ -1220,12 +1123,11 @@ static int manager_parse_config_file(Manager *m) {
return -errno;
}
- r = config_parse(fn, f, "Login\0", config_item_perf_lookup, (void*) logind_gperf_lookup, false, m);
+ r = config_parse(NULL, fn, f, "Login\0", config_item_perf_lookup,
+ (void*) logind_gperf_lookup, false, false, m);
if (r < 0)
log_warning("Failed to parse configuration file: %s", strerror(-r));
- fclose(f);
-
return r;
}
@@ -1234,6 +1136,7 @@ int main(int argc, char *argv[]) {
int r;
log_set_target(LOG_TARGET_AUTO);
+ log_set_facility(LOG_AUTH);
log_parse_environment();
log_open();
@@ -1245,10 +1148,18 @@ int main(int argc, char *argv[]) {
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. */
+ mkdir_label("/run/systemd/seats", 0755);
+ mkdir_label("/run/systemd/users", 0755);
+ mkdir_label("/run/systemd/sessions", 0755);
+
m = manager_new();
if (!m) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}