X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogind-session.c;h=ab4de66ca4d8c4bc90eb521a72029476296a0a82;hp=705b1e41cf6190a2f004ba14c6365f4825b11a05;hb=b5ef5549e9889eea1c66c4ed88667b5922cd9f76;hpb=b6f68af13cadcbbfefd38cf8ff9a46553576f3af diff --git a/src/logind-session.c b/src/logind-session.c index 705b1e41c..ab4de66ca 100644 --- a/src/logind-session.c +++ b/src/logind-session.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "logind-session.h" #include "strv.h" @@ -56,7 +57,7 @@ Session* session_new(Manager *m, User *u, const char *id) { } s->manager = m; - s->pipe_fd = -1; + s->fifo_fd = -1; s->user = u; LIST_PREPEND(Session, sessions_by_user, u->sessions, s); @@ -98,7 +99,7 @@ void session_free(Session *s) { hashmap_remove(s->manager->sessions, s->id); - session_unset_pipe_fd(s); + session_remove_fifo(s); free(s->state_file); free(s); @@ -149,6 +150,11 @@ int session_save(Session *s) { "CGROUP=%s\n", s->cgroup_path); + if (s->fifo_path) + fprintf(f, + "FIFO=%s\n", + s->fifo_path); + if (s->seat) fprintf(f, "SEAT=%s\n", @@ -229,6 +235,7 @@ int session_load(Session *s) { "REMOTE", &remote, "KILL_PROCESSES", &kill_processes, "CGROUP", &s->cgroup_path, + "FIFO", &s->fifo_path, "SEAT", &seat, "TTY", &s->tty, "DISPLAY", &s->display, @@ -290,6 +297,20 @@ int session_load(Session *s) { s->type = t; } + if (s->fifo_path) { + int fd; + + /* If we open an unopened pipe for reading we will not + get an EOF. to trigger an EOF we hence open it for + reading, but close it right-away which then will + trigger the EOF. */ + + fd = session_create_fifo(s); + if (fd >= 0) + close_nointr_nofail(fd); + } + + finish: free(remote); free(kill_processes); @@ -328,7 +349,6 @@ int session_activate(Session *s) { return seat_apply_acls(s->seat, old_active); } - static int session_link_x11_socket(Session *s) { char *t, *f, *c; size_t k; @@ -360,13 +380,15 @@ static int session_link_x11_socket(Session *s) { return -ENOENT; } - t = strappend(s->user->runtime_path, "/display"); + t = strappend(s->user->runtime_path, "/X11/display"); if (!t) { log_error("Out of memory"); free(f); return -ENOMEM; } + mkdir_parents(t, 0755); + if (link(f, t) < 0) { if (errno == EEXIST) { unlink(t); @@ -465,6 +487,7 @@ static int session_create_cgroup(Session *s) { STRV_FOREACH(k, s->manager->controllers) { if (strv_contains(s->reset_controllers, *k) || + strv_contains(s->manager->reset_controllers, *k) || strv_contains(s->controllers, *k)) continue; @@ -481,6 +504,18 @@ static int session_create_cgroup(Session *s) { log_warning("Failed to reset controller %s: %s", *k, strerror(-r)); } + + STRV_FOREACH(k, s->manager->reset_controllers) { + + if (strv_contains(s->reset_controllers, *k) || + strv_contains(s->controllers, *k)) + continue; + + r = cg_attach(*k, "/", s->leader); + if (r < 0) + log_warning("Failed to reset controller %s: %s", *k, strerror(-r)); + + } } hashmap_put(s->manager->cgroups, s->cgroup_path, s); @@ -511,16 +546,22 @@ int session_start(Session *s) { /* Create X11 symlink */ session_link_x11_socket(s); - /* Save session data */ - session_save(s); - dual_timestamp_get(&s->timestamp); + if (s->seat) + seat_read_active_vt(s->seat); + s->started = true; + /* Save session data */ + session_save(s); + user_save(s->user); + session_send_signal(s, true); if (s->seat) { + seat_save(s->seat); + if (s->seat->active == s) seat_send_changed(s->seat, "Sessions\0ActiveSession\0"); else @@ -599,7 +640,7 @@ static int session_unlink_x11_socket(Session *s) { s->user->display = NULL; - t = strappend(s->user->runtime_path, "/display"); + t = strappend(s->user->runtime_path, "/X11/display"); if (!t) { log_error("Out of memory"); return -ENOMEM; @@ -741,53 +782,80 @@ void session_set_idle_hint(Session *s, bool b) { "IdleSinceHintMonotonic\0"); } -int session_set_pipe_fd(Session *s, int fd) { - struct epoll_event ev; +int session_create_fifo(Session *s) { int r; assert(s); - assert(fd >= 0); - assert(s->pipe_fd < 0); - r = hashmap_put(s->manager->pipe_fds, INT_TO_PTR(fd + 1), s); - if (r < 0) - return r; + /* Create FIFO */ + if (!s->fifo_path) { + r = safe_mkdir("/run/systemd/sessions", 0755, 0, 0); + if (r < 0) + return r; - zero(ev); - ev.events = 0; - ev.data.u32 = FD_PIPE_BASE + fd; + if (asprintf(&s->fifo_path, "/run/systemd/sessions/%s.ref", s->id) < 0) + return -ENOMEM; - if (epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { - assert_se(hashmap_remove(s->manager->pipe_fds, INT_TO_PTR(fd + 1)) == s); - return -errno; + if (mkfifo(s->fifo_path, 0600) < 0 && errno != EEXIST) + return -errno; } - s->pipe_fd = fd; - return 0; -} + /* Open reading side */ + if (s->fifo_fd < 0) { + struct epoll_event ev; -void session_unset_pipe_fd(Session *s) { - assert(s); + s->fifo_fd = open(s->fifo_path, O_RDONLY|O_CLOEXEC|O_NDELAY); + if (s->fifo_fd < 0) + return -errno; - if (s->pipe_fd < 0) - return; + r = hashmap_put(s->manager->fifo_fds, INT_TO_PTR(s->fifo_fd + 1), s); + if (r < 0) + return r; - assert_se(hashmap_remove(s->manager->pipe_fds, INT_TO_PTR(s->pipe_fd + 1)) == s); + zero(ev); + ev.events = 0; + ev.data.u32 = FD_FIFO_BASE + s->fifo_fd; - assert_se(epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_DEL, s->pipe_fd, NULL) == 0); + if (epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_ADD, s->fifo_fd, &ev) < 0) + return -errno; + } - close_nointr_nofail(s->pipe_fd); - s->pipe_fd = -1; + /* Open writing side */ + r = open(s->fifo_path, O_WRONLY|O_CLOEXEC|O_NDELAY); + if (r < 0) + return -errno; + + return r; } -int session_check_gc(Session *s) { +void session_remove_fifo(Session *s) { + assert(s); + + if (s->fifo_fd >= 0) { + assert_se(hashmap_remove(s->manager->fifo_fds, INT_TO_PTR(s->fifo_fd + 1)) == s); + assert_se(epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_DEL, s->fifo_fd, NULL) == 0); + close_nointr_nofail(s->fifo_fd); + s->fifo_fd = -1; + } + + if (s->fifo_path) { + unlink(s->fifo_path); + free(s->fifo_path); + s->fifo_path = NULL; + } +} + +int session_check_gc(Session *s, bool drop_not_started) { int r; assert(s); - if (s->pipe_fd >= 0) { + if (drop_not_started && !s->started) + return 0; + + if (s->fifo_fd >= 0) { - r = pipe_eof(s->pipe_fd); + r = pipe_eof(s->fifo_fd); if (r < 0) return r;