#include <string.h>
#include <unistd.h>
#include <sys/epoll.h>
+#include <sys/ioctl.h>
+#include <linux/vt.h>
#include "logind.h"
#include "dbus-common.h"
#include "dbus-loop.h"
-enum {
- FD_UDEV,
- FD_CONSOLE,
- FD_BUS
-};
-
Manager *manager_new(void) {
Manager *m;
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->pipe_fds = hashmap_new(trivial_hash_func, trivial_compare_func);
if (!m->devices || !m->seats || !m->sessions || !m->users) {
manager_free(m);
hashmap_free(m->users);
hashmap_free(m->devices);
hashmap_free(m->seats);
+ hashmap_free(m->cgroups);
+ hashmap_free(m->pipe_fds);
if (m->console_active_fd >= 0)
close_nointr_nofail(m->console_active_fd);
int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **_user) {
User *u;
- int r;
assert(m);
assert(name);
if (!u)
return -ENOMEM;
- r = user_start(u);
- if (r < 0) {
- user_stop(u);
- user_free(u);
- } else {
- if (_user)
- *_user = u;
- }
+ if (_user)
+ *_user = u;
- return r;
+ return 0;
}
int manager_add_user_by_name(Manager *m, const char *name, User **_user) {
}
int manager_process_device(Manager *m, struct udev_device *d) {
- const char *sn;
- Seat *seat;
Device *device;
int r;
assert(m);
- sn = udev_device_get_property_value(d, "SEAT");
- if (!sn)
- sn = "seat0";
+ /* FIXME: drop this check as soon as libudev's enum support
+ * honours tags and subsystem matches at the same time */
+ if (!streq_ptr(udev_device_get_subsystem(d), "graphics"))
+ return 0;
- r = manager_add_device(m, udev_device_get_syspath(d), &device);
- if (r < 0)
- return r;
+ if (streq_ptr(udev_device_get_action(d), "remove")) {
- r = manager_add_seat(m, sn, &seat);
- if (r < 0)
- return r;
+ /* FIXME: use syspath instead of sysname here, as soon as fb driver is fixed */
+ device = hashmap_get(m->devices, udev_device_get_sysname(d));
+ if (!device)
+ return 0;
+
+ seat_add_to_gc_queue(device->seat);
+ device_free(device);
+
+ } else {
+ const char *sn;
+ Seat *seat;
+
+ sn = udev_device_get_property_value(d, "ID_SEAT");
+ if (!sn)
+ sn = "seat0";
+
+ if (!seat_name_is_valid(sn)) {
+ log_warning("Device with invalid seat name %s found, ignoring.", sn);
+ return 0;
+ }
+
+ r = manager_add_device(m, udev_device_get_sysname(d), &device);
+ if (r < 0)
+ return r;
+
+ r = manager_add_seat(m, sn, &seat);
+ if (r < 0) {
+ if (!device->seat)
+ device_free(device);
+
+ return r;
+ }
+
+ device_attach(device, seat);
+ seat_start(seat);
+ }
- device_attach(device, seat);
return 0;
}
int manager_enumerate_devices(Manager *m) {
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_enumerate *e;
- int r = -ENOMEM;
+ int r;
assert(m);
* necessary */
e = udev_enumerate_new(m->udev);
- if (!e)
- return -ENOMEM;
+ if (!e) {
+ r = -ENOMEM;
+ goto finish;
+ }
- if (udev_enumerate_add_match_subsystem(e, "graphics") < 0)
+ r = udev_enumerate_add_match_subsystem(e, "graphics");
+ if (r < 0)
goto finish;
- if (udev_enumerate_add_match_tag(e, "seat") < 0)
+ r = udev_enumerate_add_match_tag(e, "seat");
+ if (r < 0)
goto finish;
- if (udev_enumerate_scan_devices(e) < 0)
+ r = udev_enumerate_scan_devices(e);
+ if (r < 0)
goto finish;
first = udev_enumerate_get_list_entry(e);
int k;
d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
- if (!d)
+ if (!d) {
+ r = -ENOMEM;
goto finish;
+ }
k = manager_process_device(m, d);
udev_device_unref(d);
while ((r = cg_read_subgroup(d, &name)) > 0) {
User *user;
+ int k;
+
+ k = manager_add_user_by_name(m, name, &user);
+ if (k < 0) {
+ free(name);
+ r = k;
+ continue;
+ }
+
+ user_add_to_gc_queue(user);
+
+ if (!user->cgroup_path)
+ if (asprintf(&user->cgroup_path, "%s/%s", m->cgroup_path, name) < 0) {
+ r = -ENOMEM;
+ free(name);
+ break;
+ }
- r = manager_add_user_by_name(m, name, &user);
free(name);
+ }
- if (r < 0)
- break;
+ closedir(d);
+
+ return r;
+}
+
+
+static int manager_enumerate_linger_users(Manager *m) {
+ DIR *d;
+ struct dirent *de;
+ int r = 0;
- if (user->cgroup_path)
+ d = opendir("/var/lib/systemd/linger");
+ if (!d) {
+ if (errno == ENOENT)
+ return 0;
+
+ log_error("Failed to open /var/lib/systemd/linger/: %m");
+ return -errno;
+ }
+
+ while ((de = readdir(d))) {
+ int k;
+
+ if (!dirent_is_file(de))
continue;
- if (asprintf(&user->cgroup_path, "%s/%s", m->cgroup_path, name) < 0) {
- r = -ENOMEM;
- break;
+ k = manager_add_user_by_name(m, de->d_name, NULL);
+ if (k < 0) {
+ log_notice("Couldn't add lingering user %s: %s", de->d_name, strerror(-k));
+ r = k;
}
}
- if (d)
- closedir(d);
+ closedir(d);
return r;
}
int manager_enumerate_users(Manager *m) {
DIR *d;
struct dirent *de;
- int r;
+ int r, k;
assert(m);
+ /* First, enumerate user cgroups */
r = manager_enumerate_users_from_cgroup(m);
+ /* Second, add lingering users on top */
+ k = manager_enumerate_linger_users(m);
+ if (k < 0)
+ r = k;
+
+ /* Third, read in user data stored on disk */
d = opendir("/run/systemd/users");
if (!d) {
if (errno == ENOENT)
while ((de = readdir(d))) {
unsigned long ul;
User *u;
- int k;
if (!dirent_is_file(de))
continue;
char *name;
int k;
+ if (!u->cgroup_path)
+ continue;
+
k = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, &d);
if (k < 0) {
if (k == -ENOENT)
Session *session;
k = manager_add_session(m, u, name, &session);
- free(name);
-
- if (k < 0)
+ if (k < 0) {
+ free(name);
break;
+ }
- if (session->cgroup_path)
- continue;
+ session_add_to_gc_queue(session);
- if (asprintf(&session->cgroup_path, "%s/%s", u->cgroup_path, name) < 0) {
- k = -ENOMEM;
- break;
- }
+ if (!session->cgroup_path)
+ if (asprintf(&session->cgroup_path, "%s/%s", u->cgroup_path, name) < 0) {
+ k = -ENOMEM;
+ free(name);
+ break;
+ }
+
+ free(name);
}
closedir(d);
assert(m);
+ /* First enumerate session cgroups */
r = manager_enumerate_sessions_from_cgroup(m);
+ /* Second, read in session data stored on disk */
d = opendir("/run/systemd/sessions");
if (!d) {
if (errno == ENOENT)
return r;
}
-int manager_start_linger_users(Manager *m) {
- DIR *d;
- struct dirent *de;
- int r = 0;
-
- d = opendir("/var/lib/systemd/linger");
- if (!d) {
- if (errno == ENOENT)
- return 0;
-
- log_error("Failed to open /var/lib/systemd/linger/: %m");
- return -errno;
- }
-
- while ((de = readdir(d))) {
- int k;
-
- if (!dirent_is_file(de))
- continue;
-
- k = manager_add_user_by_name(m, de->d_name, NULL);
- if (k < 0) {
- log_notice("Couldn't add lingering user %s: %s", de->d_name, strerror(-k));
- r = k;
- }
- }
-
- closedir(d);
-
- return r;
-}
-
int manager_dispatch_udev(Manager *m) {
struct udev_device *d;
int r;
}
int manager_dispatch_console(Manager *m) {
- char t[64];
- ssize_t k;
- int r, vtnr;
+ 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;
+ DBusMessage *message = NULL, *reply = NULL;
+ char *name = NULL;
+ const char *mode = "fail";
+ DBusError error;
assert(m);
- lseek(m->console_active_fd, SEEK_SET, 0);
+ dbus_error_init(&error);
+
+ r = vt_is_busy(vtnr);
+ if (r != 0)
+ return r;
- k = read(m->console_active_fd, t, sizeof(t)-1);
- if (k <= 0) {
- log_error("Failed to read current console: %s", k < 0 ? strerror(-errno) : "EOF");
- return k < 0 ? -errno : -EIO;
+ 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;
}
- t[k] = 0;
- if (!startswith(t, "tty")) {
- log_error("Hm, /sys/class/tty/tty0/active is badly formatted.");
- return -EIO;
+ if (asprintf(&name, "autovt-getty@tty%i.service", vtnr) < 0) {
+ log_error("Could not allocate service name.");
+ r = -ENOMEM;
+ goto finish;
}
- r = safe_atoi(t+3, &vtnr);
- if (r < 0) {
- log_error("Failed to parse VT number %s", t+3);
- return r;
+ 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;
}
- if (vtnr <= 0) {
- log_error("VT number invalid: %s", t+3);
- return -EIO;
+ 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;
}
- if (m->vtconsole)
- seat_active_vt_changed(m->vtconsole, vtnr);
+ r = 0;
- return 0;
+finish:
+ free(name);
+
+ if (message)
+ dbus_message_unref(message);
+
+ if (reply)
+ dbus_message_unref(reply);
+
+ dbus_error_free(&error);
+
+ return r;
}
-int manager_spawn_autovt(Manager *m, int vtnr) {
+void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
+ Session *s;
+ char *p;
+
assert(m);
+ assert(cgroup);
- return 0;
-}
+ p = strdup(cgroup);
+ if (!p) {
+ log_error("Out of memory.");
+ return;
+ }
+
+ for (;;) {
+ char *e;
+
+ if (isempty(p) || streq(p, "/"))
+ break;
+
+ s = hashmap_get(m->cgroups, p);
+ if (s)
+ session_add_to_gc_queue(s);
-static DBusHandlerResult login_message_handler(
- DBusConnection *connection,
- DBusMessage *message,
- void *userdata) {
+ assert_se(e = strrchr(p, '/'));
+ *e = 0;
+ }
- return DBUS_HANDLER_RESULT_HANDLED;
+ free(p);
}
-static DBusHandlerResult login_message_filter(
- DBusConnection *connection,
- DBusMessage *message,
- void *userdata) {
+static void manager_pipe_notify_eof(Manager *m, int fd) {
+ Session *s;
- return DBUS_HANDLER_RESULT_HANDLED;
+ assert_se(m);
+ assert_se(fd >= 0);
+
+ assert_se(s = hashmap_get(m->pipe_fds, INT_TO_PTR(fd + 1)));
+ assert(s->pipe_fd == fd);
+ session_unset_pipe_fd(s);
+
+ session_stop(s);
}
static int manager_connect_bus(Manager *m) {
- const DBusObjectPathVTable login_vtable = {
- .message_function = login_message_handler
- };
-
DBusError error;
int r;
struct epoll_event ev;
m->bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
if (!m->bus) {
- log_error("Failed to get system D-Bus connection: %s", error.message);
+ log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error));
r = -ECONNREFUSED;
goto fail;
}
- if (!dbus_connection_register_object_path(m->bus, "/org/freedesktop/login1", &login_vtable, NULL)) {
- log_error("Not enough memory");
- r = -ENOMEM;
- goto fail;
- }
-
- if (!dbus_connection_add_filter(m->bus, login_message_filter, m, NULL)) {
+ if (!dbus_connection_register_object_path(m->bus, "/org/freedesktop/login1", &bus_manager_vtable, m) ||
+ !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/seat", &bus_seat_vtable, m) ||
+ !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/session", &bus_session_vtable, m) ||
+ !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/user", &bus_user_vtable, m) ||
+ !dbus_connection_add_filter(m->bus, bus_message_filter, m, NULL)) {
log_error("Not enough memory");
r = -ENOMEM;
goto fail;
&error);
if (dbus_error_is_set(&error)) {
- log_error("Failed to register match: %s", error.message);
+ log_error("Failed to register match: %s", bus_error_message(&error));
+ r = -EIO;
+ goto fail;
+ }
+
+ 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;
}
- if (dbus_bus_request_name(m->bus, "org.freedesktop.login1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) < 0) {
- log_error("Failed to register name on bus: %s", error.message);
+ if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ log_error("Failed to acquire name.");
r = -EEXIST;
goto fail;
}
}
zero(ev);
- ev.events = EPOLLIN;
+ ev.events = 0;
ev.data.u32 = FD_CONSOLE;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->console_active_fd, &ev) < 0)
static int manager_connect_udev(Manager *m) {
struct epoll_event ev;
+ int r;
assert(m);
assert(!m->udev_monitor);
if (!m->udev_monitor)
return -ENOMEM;
- udev_monitor_filter_add_match_tag(m->udev_monitor, "seat");
+ r = udev_monitor_filter_add_match_tag(m->udev_monitor, "seat");
+ if (r < 0)
+ return r;
- if (udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "graphics", NULL) < 0)
- return -ENOMEM;
+ r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "graphics", NULL);
+ if (r < 0)
+ return r;
- if (udev_monitor_enable_receiving(m->udev_monitor) < 0)
- return -ENOMEM;
+ r = udev_monitor_enable_receiving(m->udev_monitor);
+ if (r < 0)
+ return r;
m->udev_fd = udev_monitor_get_fd(m->udev_monitor);
return 0;
}
+void manager_gc(Manager *m) {
+ Seat *seat;
+ Session *session;
+ User *user;
+
+ assert(m);
+
+ while ((seat = m->seat_gc_queue)) {
+ LIST_REMOVE(Seat, gc_queue, m->seat_gc_queue, seat);
+ seat->in_gc_queue = false;
+
+ if (seat_check_gc(seat) == 0) {
+ seat_stop(seat);
+ seat_free(seat);
+ }
+ }
+
+ while ((session = m->session_gc_queue)) {
+ LIST_REMOVE(Session, gc_queue, m->session_gc_queue, session);
+ session->in_gc_queue = false;
+
+ if (session_check_gc(session) == 0) {
+ session_stop(session);
+ session_free(session);
+ }
+ }
+
+ while ((user = m->user_gc_queue)) {
+ LIST_REMOVE(User, gc_queue, m->user_gc_queue, user);
+ user->in_gc_queue = false;
+
+ if (user_check_gc(user) == 0) {
+ user_stop(user);
+ user_free(user);
+ }
+ }
+}
+
+int manager_get_idle_hint(Manager *m, dual_timestamp *t) {
+ Session *s;
+ bool idle_hint = true;
+ dual_timestamp ts = { 0, 0 };
+ Iterator i;
+
+ 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 (t)
+ *t = ts;
+
+ return idle_hint;
+}
+
int manager_startup(Manager *m) {
int r;
+ Seat *seat;
+ Session *session;
+ User *user;
+ Iterator i;
assert(m);
assert(m->epoll_fd <= 0);
if (r < 0)
return r;
+ /* Instantiate magic seat 0 */
+ r = manager_add_seat(m, "seat0", &m->vtconsole);
+ if (r < 0)
+ return r;
+
/* Deserialize state */
manager_enumerate_devices(m);
manager_enumerate_seats(m);
manager_enumerate_users(m);
manager_enumerate_sessions(m);
- /* Spawn lingering users */
- manager_start_linger_users(m);
+ /* Get rid of objects that are no longer used */
+ manager_gc(m);
+
+ /* And start everything */
+ HASHMAP_FOREACH(seat, m->seats, i)
+ seat_start(seat);
+
+ HASHMAP_FOREACH(user, m->users, i)
+ user_start(user);
+
+ HASHMAP_FOREACH(session, m->sessions, i)
+ session_start(session);
return 0;
}
struct epoll_event event;
int n;
+ manager_gc(m);
+
if (dbus_connection_dispatch(m->bus) != DBUS_DISPATCH_COMPLETE)
continue;
+ manager_gc(m);
+
n = epoll_wait(m->epoll_fd, &event, 1, -1);
if (n < 0) {
+ if (errno == EINTR || errno == EAGAIN)
+ continue;
+
log_error("epoll() failed: %m");
return -errno;
}
case FD_BUS:
bus_loop_dispatch(m->bus_fd);
break;
+
+ default:
+ if (event.data.u32 >= FD_PIPE_BASE)
+ manager_pipe_notify_eof(m, event.data.u32 - FD_PIPE_BASE);
}
}
int main(int argc, char *argv[]) {
Manager *m = NULL;
- int r = 0;
+ int r;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
~ianmdlvl / elogind.git / blobdiff