***/
#include <errno.h>
-#include <pwd.h>
#include <libudev.h>
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
-#include <sys/epoll.h>
-#include <sys/ioctl.h>
#include <linux/vt.h>
#include <sys/timerfd.h>
-#include <systemd/sd-daemon.h>
-
-#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"
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->udev_button_fd = -1;
- m->epoll_fd = -1;
m->reserve_vt_fd = -1;
m->n_autovts = 6;
m->handle_lid_switch = HANDLE_SUSPEND;
m->lid_switch_ignore_inhibited = true;
- m->idle_action_fd = -1;
m->idle_action_usec = 30 * USEC_PER_MINUTE;
m->idle_action = HANDLE_IGNORE;
m->idle_action_not_before_usec = now(CLOCK_MONOTONIC);
m->user_units = hashmap_new(string_hash_func, string_compare_func);
m->session_units = 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->button_fds = hashmap_new(trivial_hash_func, trivial_compare_func);
+ m->busnames = set_new(string_hash_func, string_compare_func);
- if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons ||
+ if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames ||
!m->user_units || !m->session_units ||
- !m->session_fds || !m->inhibitor_fds || !m->button_fds) {
+ !m->busnames) {
manager_free(m);
return NULL;
}
return NULL;
}
+ r = sd_event_default(&m->event);
+ if (r < 0) {
+ manager_free(m);
+ return NULL;
+ }
+
return m;
}
hashmap_free(m->user_units);
hashmap_free(m->session_units);
- hashmap_free(m->session_fds);
- hashmap_free(m->inhibitor_fds);
- hashmap_free(m->button_fds);
+ 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)
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);
- }
-
- if (m->bus_fd >= 0)
- close_nointr_nofail(m->bus_fd);
+ bus_verify_polkit_async_registry_free(m->bus, m->polkit_registry);
- if (m->epoll_fd >= 0)
- close_nointr_nofail(m->epoll_fd);
+ sd_bus_unref(m->bus);
+ sd_event_unref(m->event);
if (m->reserve_vt_fd >= 0)
close_nointr_nofail(m->reserve_vt_fd);
- if (m->idle_action_fd >= 0)
- close_nointr_nofail(m->idle_action_fd);
-
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
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, 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, 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;
-
- assert(m);
- assert(name);
-
- u = hashmap_get(m->users, ULONG_TO_PTR((unsigned long) uid));
- if (u) {
- if (_user)
- *_user = u;
-
- return 0;
- }
-
- 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, NULL);
- 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_add_button(Manager *m, const char *name, Button **_button) {
- Button *b;
-
- assert(m);
- assert(name);
-
- b = hashmap_get(m->buttons, name);
- if (b) {
- if (_button)
- *_button = b;
-
- return 0;
- }
-
- b = button_new(m, name);
- if (!b)
- return -ENOMEM;
-
- if (_button)
- *_button = b;
-
- 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_process_button_device(Manager *m, struct udev_device *d) {
- Button *b;
-
- int r;
-
- assert(m);
-
- if (streq_ptr(udev_device_get_action(d), "remove")) {
-
- b = hashmap_get(m->buttons, udev_device_get_sysname(d));
- if (!b)
- return 0;
-
- button_free(b);
-
- } else {
- const char *sn;
-
- r = manager_add_button(m, udev_device_get_sysname(d), &b);
- if (r < 0)
- return r;
-
- sn = udev_device_get_property_value(d, "ID_SEAT");
- if (isempty(sn))
- sn = "seat0";
-
- button_set_seat(b, sn);
- button_open(b);
- }
-
- return 0;
-}
-
-int manager_enumerate_devices(Manager *m) {
+static int manager_enumerate_devices(Manager *m) {
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_enumerate *e;
int r;
return r;
}
-int manager_enumerate_buttons(Manager *m) {
+static int manager_enumerate_buttons(Manager *m) {
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_enumerate *e;
int r;
return r;
}
-int manager_enumerate_seats(Manager *m) {
+static int manager_enumerate_seats(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
return r;
}
-int manager_enumerate_users(Manager *m) {
+static int manager_enumerate_users(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r, k;
return r;
}
-int manager_enumerate_sessions(Manager *m) {
+static int manager_enumerate_sessions(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
return r;
}
-int manager_enumerate_inhibitors(Manager *m) {
+static int manager_enumerate_inhibitors(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
return r;
}
-int manager_dispatch_seat_udev(Manager *m) {
+static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
struct udev_device *d;
int r;
return r;
}
-int manager_dispatch_vcsa_udev(Manager *m) {
+static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
+ struct udev_device *d;
+ int r;
+
+ assert(m);
+
+ 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;
+}
+
+static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
struct udev_device *d;
int r = 0;
const char *name;
* 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);
+ r = seat_preallocate_vts(m->seat0);
udev_device_unref(d);
return r;
}
-int manager_dispatch_button_udev(Manager *m) {
+static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
struct udev_device *d;
int r;
return r;
}
-int manager_dispatch_console(Manager *m) {
- assert(m);
-
- if (m->vtconsole)
- seat_read_active_vt(m->vtconsole);
-
- 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));
-
- close_nointr_nofail(fd);
-
- return r;
-}
-
-int manager_spawn_autovt(Manager *m, int vtnr) {
- int r;
- char *name = NULL;
- const char *mode = "fail";
+static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
assert(m);
- assert(vtnr >= 1);
+ assert(m->seat0);
+ assert(m->console_active_fd == fd);
- if ((unsigned) vtnr > m->n_autovts &&
- (unsigned) vtnr != m->reserve_vt)
- return 0;
+ seat_read_active_vt(m->seat0);
- if ((unsigned) vtnr != m->reserve_vt) {
- /* If this is the reserved TTY, we'll start the getty
- * on it in any case, but otherwise only if it is not
- * busy. */
-
- r = vt_is_busy(vtnr);
- if (r < 0)
- return r;
- else if (r > 0)
- return -EBUSY;
- }
-
- if (asprintf(&name, "autovt@tty%i.service", vtnr) < 0) {
- log_error("Could not allocate service name.");
- r = -ENOMEM;
- goto finish;
- }
-
- r = bus_method_call_with_reply (
- m->bus,
- "org.freedesktop.systemd1",
- "/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- "StartUnit",
- NULL,
- NULL,
- DBUS_TYPE_STRING, &name,
- DBUS_TYPE_STRING, &mode,
- DBUS_TYPE_INVALID);
-
-finish:
- free(name);
-
- return r;
+ return 0;
}
static int manager_reserve_vt(Manager *m) {
return 0;
}
-int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
- _cleanup_free_ char *unit = NULL;
- Session *s;
+static int manager_connect_bus(Manager *m) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
assert(m);
- assert(pid >= 1);
- assert(session);
+ assert(!m->bus);
- r = cg_pid_get_unit(pid, &unit);
- if (r < 0)
+ r = sd_bus_default_system(&m->bus);
+ if (r < 0) {
+ log_error("Failed to connect to system bus: %s", strerror(-r));
return r;
+ }
- s = hashmap_get(m->session_units, unit);
- if (!s)
- return 0;
-
- *session = s;
- return 1;
-}
-
-int manager_get_user_by_pid(Manager *m, pid_t pid, User **user) {
- _cleanup_free_ char *unit = NULL;
- User *u;
- int r;
-
- assert(m);
- assert(pid >= 1);
- assert(user);
-
- r = cg_pid_get_slice(pid, &unit);
- if (r < 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;
-
- u = hashmap_get(m->user_units, unit);
- if (!u)
- return 0;
-
- *user = u;
- return 1;
-}
-
-static void manager_dispatch_other(Manager *m, int fd) {
- Session *s;
- Inhibitor *i;
- Button *b;
-
- assert_se(m);
- assert_se(fd >= 0);
-
- 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;
}
- 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;
+ 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;
}
- b = hashmap_get(m->button_fds, INT_TO_PTR(fd + 1));
- if (b) {
- assert(b->fd == fd);
- button_process(b);
- return;
+ 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;
}
- assert_not_reached("Got event for unknown fd");
-}
-
-static int manager_connect_bus(Manager *m) {
- DBusError error;
- int r;
- struct epoll_event ev = {
- .events = EPOLLIN,
- .data.u32 = FD_BUS,
- };
+ 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;
+ }
- assert(m);
- assert(!m->bus);
- assert(m->bus_fd < 0);
+ 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;
+ }
- dbus_error_init(&error);
+ 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;
+ }
- 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_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;
}
- 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)) {
- r = log_oom();
- 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;
}
- dbus_bus_add_match(m->bus,
- "type='signal',"
- "sender='org.freedesktop.systemd1',"
- "interface='org.freedesktop.systemd1.Manager',"
- "member='JobRemoved',"
- "path='/org/freedesktop/systemd1'",
- &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to add match for JobRemoved: %s", bus_error_message(&error));
- dbus_error_free(&error);
+ 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',"
- "sender='org.freedesktop.systemd1',"
- "interface='org.freedesktop.systemd1.Manager',"
- "member='UnitRemoved',"
- "path='/org/freedesktop/systemd1'",
- &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to add match for UnitRemoved: %s", bus_error_message(&error));
- dbus_error_free(&error);
+ 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;
}
- dbus_bus_add_match(m->bus,
- "type='signal',"
- "sender='org.freedesktop.systemd1',"
- "interface='org.freedesktop.DBus.Properties',"
- "member='PropertiesChanged'",
- &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to add match for PropertiesChanged: %s", bus_error_message(&error));
- dbus_error_free(&error);
+ 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;
}
- dbus_bus_add_match(m->bus,
- "type='signal',"
- "sender='org.freedesktop.systemd1',"
- "interface='org.freedesktop.systemd1.Manager',"
- "member='Reloading',"
- "path='/org/freedesktop/systemd1'",
- &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to add match for Reloading: %s", bus_error_message(&error));
- dbus_error_free(&error);
+ 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;
}
- r = bus_method_call_with_reply(
+ r = sd_bus_call_method(
m->bus,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
"Subscribe",
- NULL,
&error,
- DBUS_TYPE_INVALID);
+ NULL, NULL);
if (r < 0) {
- log_error("Failed to enable subscription: %s", bus_error(&error, r));
- dbus_error_free(&error);
+ log_error("Failed to enable subscription: %s", bus_error_message(&error, 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_request_name(m->bus, "org.freedesktop.login1", SD_BUS_NAME_DO_NOT_QUEUE);
+ if (r < 0) {
+ log_error("Failed to register name: %s", strerror(-r));
+ return r;
}
- if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ if (r != SD_BUS_NAME_PRIMARY_OWNER) {
log_error("Failed to acquire name.");
- r = -EEXIST;
- goto fail;
+ return -EEXIST;
}
- m->bus_fd = bus_loop_open(m->bus);
- if (m->bus_fd < 0) {
- r = m->bus_fd;
- 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;
}
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->bus_fd, &ev) < 0)
- goto fail;
-
return 0;
-
-fail:
- dbus_error_free(&error);
-
- return r;
}
static int manager_connect_console(Manager *m) {
- struct epoll_event ev = {
- .events = 0,
- .data.u32 = FD_CONSOLE,
- };
+ 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) {
- 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) {
return -errno;
}
- 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) {
int r;
- struct epoll_event ev = {
- .events = EPOLLIN,
- .data.u32 = FD_SEAT_UDEV,
- };
assert(m);
assert(!m->udev_seat_monitor);
+ assert(!m->udev_device_monitor);
assert(!m->udev_vcsa_monitor);
assert(!m->udev_button_monitor);
if (r < 0)
return r;
- m->udev_seat_fd = udev_monitor_get_fd(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;
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_seat_fd, &ev) < 0)
- return -errno;
+ m->udev_device_monitor = udev_monitor_new_from_netlink(m->udev, "udev");
+ if (!m->udev_device_monitor)
+ return -ENOMEM;
+
+ r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_device_monitor, "input", NULL);
+ if (r < 0)
+ return r;
+
+ r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_device_monitor, "graphics", NULL);
+ if (r < 0)
+ return r;
+
+ r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_device_monitor, "drm", NULL);
+ if (r < 0)
+ return r;
+
+ r = udev_monitor_enable_receiving(m->udev_device_monitor);
+ if (r < 0)
+ return r;
+
+ 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;
/* Don't watch keys if nobody cares */
if (m->handle_power_key != HANDLE_IGNORE ||
if (r < 0)
return r;
- m->udev_button_fd = udev_monitor_get_fd(m->udev_button_monitor);
-
- zero(ev);
- ev.events = EPOLLIN;
- ev.data.u32 = FD_BUTTON_UDEV;
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_button_fd, &ev) < 0)
- return -errno;
+ 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 (r < 0)
return r;
- m->udev_vcsa_fd = udev_monitor_get_fd(m->udev_vcsa_monitor);
-
- zero(ev);
- ev.events = EPOLLIN;
- ev.data.u32 = FD_VCSA_UDEV;
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_vcsa_fd, &ev) < 0)
- return -errno;
+ 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;
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;
- dual_timestamp ts = { 0, 0 };
- Iterator i;
-
- assert(m);
-
- idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t, false, false, 0);
-
- 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 (t)
- *t = ts;
-
- return idle_hint;
-}
-
-bool manager_shall_kill(Manager *m, const char *user) {
- assert(m);
- assert(user);
-
- if (!m->kill_user_processes)
- return false;
-
- if (strv_contains(m->kill_exclude_users, user))
- return false;
-
- if (strv_isempty(m->kill_only_users))
- return true;
-
- return strv_contains(m->kill_only_users, user);
-}
-
-int manager_dispatch_idle_action(Manager *m) {
+static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *userdata) {
+ Manager *m = userdata;
struct dual_timestamp since;
- struct itimerspec its = {};
+ usec_t n, elapse;
int r;
- usec_t n;
assert(m);
if (m->idle_action == HANDLE_IGNORE ||
- m->idle_action_usec <= 0) {
- r = 0;
- goto finish;
- }
+ 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. */
- timespec_store(&its.it_value, n + m->idle_action_usec);
+ 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. */
m->idle_action_not_before_usec = n;
}
- timespec_store(&its.it_value, MAX(since.monotonic, m->idle_action_not_before_usec) + m->idle_action_usec);
+ elapse = MAX(since.monotonic, m->idle_action_not_before_usec) + m->idle_action_usec;
}
- if (m->idle_action_fd < 0) {
- struct epoll_event ev = {
- .events = EPOLLIN,
- .data.u32 = FD_IDLE_ACTION,
- };
+ if (!m->idle_action_event_source) {
- m->idle_action_fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC);
- if (m->idle_action_fd < 0) {
- log_error("Failed to create idle action timer: %m");
- r = -errno;
- goto finish;
+ 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;
}
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->idle_action_fd, &ev) < 0) {
- log_error("Failed to add idle action timer to epoll: %m");
- r = -errno;
- goto finish;
+ 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;
}
- }
- if (timerfd_settime(m->idle_action_fd, TFD_TIMER_ABSTIME, &its, NULL) < 0) {
- log_error("Failed to reset timerfd: %m");
- r = -errno;
- goto finish;
+ 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;
-
-finish:
- if (m->idle_action_fd >= 0) {
- close_nointr_nofail(m->idle_action_fd);
- m->idle_action_fd = -1;
- }
-
- return r;
}
+
int manager_startup(Manager *m) {
int r;
Seat *seat;
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);
/* 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);
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 */
r = manager_enumerate_devices(m);
HASHMAP_FOREACH(inhibitor, m->inhibitors, i)
inhibitor_start(inhibitor);
- manager_dispatch_idle_action(m);
+ manager_dispatch_idle_action(NULL, 0, m);
return 0;
}
}
int manager_run(Manager *m) {
+ int r;
+
assert(m);
for (;;) {
- struct epoll_event event;
- int n;
- int msec = -1;
+ usec_t us = (uint64_t) -1;
+
+ r = sd_event_get_state(m->event);
+ if (r < 0)
+ return r;
+ if (r == SD_EVENT_FINISHED)
+ return 0;
manager_gc(m, true);
if (manager_recheck_buttons(m) > 0)
continue;
- if (dbus_connection_dispatch(m->bus) != DBUS_DISPATCH_COMPLETE)
- continue;
-
- manager_gc(m, true);
-
if (m->action_what != 0 && !m->action_job) {
usec_t x, y;
x = now(CLOCK_MONOTONIC);
y = m->action_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;
+ us = x >= y ? 0 : y - x;
}
- 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_BUTTON_UDEV:
- manager_dispatch_button_udev(m);
- break;
-
- case FD_CONSOLE:
- manager_dispatch_console(m);
- break;
-
- case FD_IDLE_ACTION:
- manager_dispatch_idle_action(m);
- break;
-
- case FD_BUS:
- bus_loop_dispatch(m->bus_fd);
- break;
-
- default:
- if (event.data.u32 >= FD_OTHER_BASE)
- manager_dispatch_other(m, event.data.u32 - FD_OTHER_BASE);
- }
+ r = sd_event_run(m->event, us);
+ if (r < 0)
+ return r;
}
return 0;