#include "util.h"
#include "mkdir.h"
#include "path-util.h"
-#include "cgroup-util.h"
#include "fileio.h"
#include "dbus-common.h"
#include "logind-session.h"
+static unsigned devt_hash_func(const void *p) {
+ uint64_t u = *(const dev_t*)p;
+
+ return uint64_hash_func(&u);
+}
+
+static int devt_compare_func(const void *_a, const void *_b) {
+ dev_t a, b;
+
+ a = *(const dev_t*) _a;
+ b = *(const dev_t*) _b;
+
+ return a < b ? -1 : (a > b ? 1 : 0);
+}
+
Session* session_new(Manager *m, const char *id) {
Session *s;
assert(m);
assert(id);
+ assert(session_id_valid(id));
s = new0(Session, 1);
if (!s)
return NULL;
}
+ s->devices = hashmap_new(devt_hash_func, devt_compare_func);
+ if (!s->devices) {
+ free(s->state_file);
+ free(s);
+ return NULL;
+ }
+
s->id = path_get_file_name(s->state_file);
if (hashmap_put(m->sessions, s->id, s) < 0) {
+ hashmap_free(s->devices);
free(s->state_file);
free(s);
return NULL;
}
void session_free(Session *s) {
+ SessionDevice *sd;
+
assert(s);
if (s->in_gc_queue)
- LIST_REMOVE(Session, gc_queue, s->manager->session_gc_queue, s);
+ LIST_REMOVE(gc_queue, s->manager->session_gc_queue, s);
+
+ session_drop_controller(s);
+
+ while ((sd = hashmap_first(s->devices)))
+ session_device_free(sd);
+
+ hashmap_free(s->devices);
if (s->user) {
- LIST_REMOVE(Session, sessions_by_user, s->user->sessions, s);
+ LIST_REMOVE(sessions_by_user, s->user->sessions, s);
if (s->user->display == s)
s->user->display = NULL;
if (s->seat) {
if (s->seat->active == s)
s->seat->active = NULL;
+ if (s->seat->pending_switch == s)
+ s->seat->pending_switch = NULL;
- LIST_REMOVE(Session, sessions_by_seat, s->seat->sessions, s);
+ LIST_REMOVE(sessions_by_seat, s->seat->sessions, s);
}
if (s->scope) {
assert(!s->user);
s->user = u;
- LIST_PREPEND(Session, sessions_by_user, u->sessions, s);
+ LIST_PREPEND(sessions_by_user, u->sessions, s);
}
int session_save(Session *s) {
if (s->service)
fprintf(f, "SERVICE=%s\n", s->service);
- if (s->seat && seat_can_multi_session(s->seat))
+ if (s->seat && seat_has_vts(s->seat))
fprintf(f, "VTNR=%i\n", s->vtnr);
if (s->leader > 0)
*seat = NULL,
*vtnr = NULL,
*leader = NULL,
- *audit_id = NULL,
*type = NULL,
*class = NULL,
*uid = NULL,
seat_attach_session(o, s);
}
- if (vtnr && s->seat && seat_can_multi_session(s->seat)) {
+ if (vtnr && s->seat && seat_has_vts(s->seat)) {
int v;
k = safe_atoi(vtnr, &v);
}
int session_activate(Session *s) {
- int r;
+ unsigned int num_pending;
assert(s);
assert(s->user);
- if (s->vtnr < 0)
- return -ENOTSUP;
-
if (!s->seat)
return -ENOTSUP;
if (s->seat->active == s)
return 0;
- assert(seat_is_vtconsole(s->seat));
+ /* on seats with VTs, we let VTs manage session-switching */
+ if (seat_has_vts(s->seat)) {
+ if (s->vtnr <= 0)
+ return -ENOTSUP;
- r = chvt(s->vtnr);
- if (r < 0)
- return r;
+ return chvt(s->vtnr);
+ }
+
+ /* On seats without VTs, we implement session-switching in logind. We
+ * try to pause all session-devices and wait until the session
+ * controller acknowledged them. Once all devices are asleep, we simply
+ * switch the active session and be done.
+ * We save the session we want to switch to in seat->pending_switch and
+ * seat_complete_switch() will perform the final switch. */
+
+ s->seat->pending_switch = s;
+
+ /* if no devices are running, immediately perform the session switch */
+ num_pending = session_device_try_pause_all(s);
+ if (!num_pending)
+ seat_complete_switch(s->seat);
- return seat_set_active(s->seat, s);
+ return 0;
}
static int session_link_x11_socket(Session *s) {
- char *t, *f, *c;
+ _cleanup_free_ char *t = NULL, *f = NULL;
+ char *c;
size_t k;
assert(s);
if (access(f, F_OK) < 0) {
log_warning("Session %s has display %s with non-existing socket %s.", s->id, s->display, f);
- free(f);
return -ENOENT;
}
* path is owned by the user */
t = strappend(s->user->runtime_path, "/X11-display");
- if (!t) {
- free(f);
+ if (!t)
return log_oom();
- }
if (link(f, t) < 0) {
if (errno == EEXIST) {
}
log_error("Failed to link %s to %s: %m", f, t);
- free(f);
- free(t);
return -errno;
}
}
done:
log_info("Linked %s to %s.", f, t);
- free(f);
- free(t);
-
s->user->display = s;
return 0;
}
static int session_start_scope(Session *s) {
- _cleanup_free_ char *description = NULL;
DBusError error;
- char *job;
int r;
assert(s);
dbus_error_init(&error);
if (!s->scope) {
- s->scope = strjoin("session-", s->id, ".scope", NULL);
- if (!s->scope)
+ _cleanup_free_ char *description = NULL;
+ const char *kill_mode;
+ char *scope, *job;
+
+ description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
+ if (!description)
return log_oom();
- r = hashmap_put(s->manager->session_units, s->scope, s);
- if (r < 0)
- log_warning("Failed to create mapping between unit and session");
- }
+ scope = strjoin("session-", s->id, ".scope", NULL);
+ if (!scope)
+ return log_oom();
- description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
+ kill_mode = manager_shall_kill(s->manager, s->user->name) ? "control-group" : "none";
- r = manager_start_scope(s->manager, s->scope, s->leader, s->user->slice, description, &error, &job);
- if (r < 0) {
- log_error("Failed to start session scope: %s %s", bus_error(&error, r), error.name);
- dbus_error_free(&error);
- } else {
- free(s->scope_job);
- s->scope_job = job;
+ r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-user-sessions.service", kill_mode, &error, &job);
+ if (r < 0) {
+ log_error("Failed to start session scope %s: %s %s",
+ scope, bus_error(&error, r), error.name);
+ dbus_error_free(&error);
+
+ free(scope);
+ return r;
+ } else {
+ s->scope = scope;
+
+ free(s->scope_job);
+ s->scope_job = job;
+ }
}
+ if (s->scope)
+ hashmap_put(s->manager->session_units, s->scope, s);
+
return 0;
}
return 0;
}
-/* static bool session_shall_kill(Session *s) { */
-/* assert(s); */
-
-/* if (!s->kill_processes) */
-/* return false; */
-
-/* if (strv_contains(s->manager->kill_exclude_users, s->user->name)) */
-/* return false; */
-
-/* if (strv_isempty(s->manager->kill_only_users)) */
-/* return true; */
-
-/* return strv_contains(s->manager->kill_only_users, s->user->name); */
-/* } */
-
static int session_stop_scope(Session *s) {
DBusError error;
char *job;
}
static int session_unlink_x11_socket(Session *s) {
- char *t;
+ _cleanup_free_ char *t = NULL;
int r;
assert(s);
return log_oom();
r = unlink(t);
- free(t);
-
return r < 0 ? -errno : 0;
}
int session_stop(Session *s) {
- int r = 0, k;
+ int r;
+
+ assert(s);
+
+ if (!s->user)
+ return -ESTALE;
+
+ /* Kill cgroup */
+ r = session_stop_scope(s);
+
+ session_save(s);
+
+ return r;
+}
+
+int session_finalize(Session *s) {
+ int r = 0;
+ SessionDevice *sd;
assert(s);
"MESSAGE=Removed session %s.", s->id,
NULL);
- /* Kill cgroup */
- k = session_stop_scope(s);
- if (k < 0)
- r = k;
+ /* Kill session devices */
+ while ((sd = hashmap_first(s->devices)))
+ session_device_free(sd);
/* Remove X11 symlink */
session_unlink_x11_socket(s);
session_add_to_gc_queue(s);
user_add_to_gc_queue(s->user);
- if (s->started)
+ if (s->started) {
session_send_signal(s, false);
-
- s->started = false;
+ s->started = false;
+ }
if (s->seat) {
if (s->seat->active == s)
return 0;
if (s->fifo_fd >= 0) {
-
r = pipe_eof(s->fifo_fd);
if (r < 0)
return r;
if (s->in_gc_queue)
return;
- LIST_PREPEND(Session, gc_queue, s->manager->session_gc_queue, s);
+ LIST_PREPEND(gc_queue, s->manager->session_gc_queue, s);
s->in_gc_queue = true;
}
SessionState session_get_state(Session *s) {
assert(s);
+ if (s->closing)
+ return SESSION_CLOSING;
+
if (s->scope_job)
- return s->started ? SESSION_OPENING : SESSION_CLOSING;
+ return SESSION_OPENING;
if (s->fifo_fd < 0)
return SESSION_CLOSING;
return manager_kill_unit(s->manager, s->scope, who, signo, NULL);
}
+bool session_is_controller(Session *s, const char *sender)
+{
+ assert(s);
+
+ return streq_ptr(s->controller, sender);
+}
+
+int session_set_controller(Session *s, const char *sender, bool force) {
+ char *t;
+ int r;
+
+ assert(s);
+ assert(sender);
+
+ if (session_is_controller(s, sender))
+ return 0;
+ if (s->controller && !force)
+ return -EBUSY;
+
+ t = strdup(sender);
+ if (!t)
+ return -ENOMEM;
+
+ r = manager_watch_busname(s->manager, sender);
+ if (r) {
+ free(t);
+ return r;
+ }
+
+ session_drop_controller(s);
+
+ s->controller = t;
+ return 0;
+}
+
+void session_drop_controller(Session *s) {
+ SessionDevice *sd;
+
+ assert(s);
+
+ if (!s->controller)
+ return;
+
+ manager_drop_busname(s->manager, s->controller);
+ free(s->controller);
+ s->controller = NULL;
+
+ /* Drop all devices as they're now unused. Do that after the controller
+ * is released to avoid sending out useles dbus signals. */
+ while ((sd = hashmap_first(s->devices)))
+ session_device_free(sd);
+}
+
static const char* const session_state_table[_SESSION_STATE_MAX] = {
[SESSION_OPENING] = "opening",
[SESSION_ONLINE] = "online",
~ianmdlvl / elogind.git / blobdiff