#include <sys/ioctl.h>
#include <linux/vt.h>
+#include <systemd/sd-daemon.h>
+
#include "logind.h"
#include "dbus-common.h"
#include "dbus-loop.h"
return r;
}
-
int manager_dispatch_vcsa_udev(Manager *m) {
struct udev_device *d;
int r = 0;
return r;
}
-void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
+int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session) {
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;
+ return -ENOMEM;
}
for (;;) {
char *e;
- if (isempty(p) || streq(p, "/"))
- break;
-
- s = hashmap_get(m->cgroups, p);
- if (s)
- session_add_to_gc_queue(s);
+ e = strrchr(p, '/');
+ if (!e || e == p) {
+ free(p);
+ *session = NULL;
+ return 0;
+ }
- assert_se(e = strrchr(p, '/'));
*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;
+ int r;
+ assert(m);
+ assert(pid >= 1);
+ assert(session);
+
+ r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &p);
+ 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);
}
static void manager_pipe_notify_eof(Manager *m, int fd) {
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.*/
+ if (errno == ENOENT)
+ return 0;
+
log_error("Failed to open /sys/class/tty/tty0/active: %m");
return -errno;
}
ev.events = EPOLLIN;
ev.data.u32 = FD_SEAT_UDEV;
- if (m->n_autovts <= 0)
+ /* Don't bother watching VCSA devices, if nobody cares */
+ if (m->n_autovts <= 0 || m->console_active_fd < 0)
return 0;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_seat_fd, &ev) < 0)
if (m->epoll_fd < 0)
return -errno;
- /* Connect to udev */
- r = manager_connect_udev(m);
+ /* Connect to console */
+ r = manager_connect_console(m);
if (r < 0)
return r;
- /* Connect to console */
- r = manager_connect_console(m);
+ /* Connect to udev */
+ r = manager_connect_udev(m);
if (r < 0)
return r;
goto finish;
}
+ log_debug("systemd-logind running as pid %lu", (unsigned long) getpid());
+
+ sd_notify(false,
+ "READY=1\n"
+ "STATUS=Processing requests...");
+
r = manager_run(m);
+ log_debug("systemd-logind stopped as pid %lu", (unsigned long) getpid());
+
finish:
+ sd_notify(false,
+ "STATUS=Shutting down...");
+
if (m)
manager_free(m);