#include "audit.h"
#include "bus-util.h"
#include "bus-error.h"
+#include "cgroup-util.h"
+#include "def.h"
#include "logind-session.h"
-
-#define RELEASE_USEC (20*USEC_PER_SEC)
+#include "formats-util.h"
static void session_remove_fifo(Session *s);
LIST_REMOVE(sessions_by_seat, s->seat->sessions, s);
}
- if (s->scope) {
- hashmap_remove(s->manager->session_units, s->scope);
- free(s->scope);
- }
-
- free(s->scope_job);
-
sd_bus_message_unref(s->create_message);
free(s->tty);
if (s->class >= 0)
fprintf(f, "CLASS=%s\n", session_class_to_string(s->class));
- if (s->scope)
- fprintf(f, "SCOPE=%s\n", s->scope);
- if (s->scope_job)
- fprintf(f, "SCOPE_JOB=%s\n", s->scope_job);
-
if (s->fifo_path)
fprintf(f, "FIFO=%s\n", s->fifo_path);
r = parse_env_file(s->state_file, NEWLINE,
"REMOTE", &remote,
- "SCOPE", &s->scope,
- "SCOPE_JOB", &s->scope_job,
"FIFO", &s->fifo_path,
"SEAT", &seat,
"TTY", &s->tty,
return 0;
}
-static int session_start_scope(Session *s) {
+static int session_start_cgroup(Session *s) {
int r;
assert(s);
assert(s->user);
- assert(s->user->slice);
-
- if (!s->scope) {
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_free_ char *description = NULL;
- char *scope, *job = NULL;
-
- description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
- if (!description)
- return log_oom();
-
- scope = strjoin("session-", s->id, ".scope", NULL);
- if (!scope)
- return log_oom();
-
- r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job);
- if (r < 0) {
- log_error("Failed to start session scope %s: %s %s",
- scope, bus_error_message(&error, r), error.name);
- free(scope);
- return r;
- } else {
- s->scope = scope;
+ assert(s->leader > 0);
- free(s->scope_job);
- s->scope_job = job;
- }
- }
+ /* First, create our own group */
+ r = cg_create(SYSTEMD_CGROUP_CONTROLLER, s->id);
+ if (r < 0)
+ return log_error_errno(r, "Failed to create cgroup %s: %m", s->id);
- if (s->scope)
- hashmap_put(s->manager->session_units, s->scope, s);
+ r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, s->id, s->leader);
+ if (r < 0)
+ log_warning_errno(r, "Failed to attach PID %d to cgroup %s: %m", s->leader, s->id);
return 0;
}
if (r < 0)
return r;
- /* Create cgroup */
- r = session_start_scope(s);
+ r = session_start_cgroup(s);
if (r < 0)
return r;
return 0;
}
-static int session_stop_scope(Session *s, bool force) {
+static int session_stop_cgroup(Session *s, bool force) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- char *job = NULL;
int r;
assert(s);
- if (!s->scope)
- return 0;
-
if (force || manager_shall_kill(s->manager, s->user->name)) {
- r = manager_stop_unit(s->manager, s->scope, &error, &job);
- if (r < 0) {
- log_error("Failed to stop session scope: %s", bus_error_message(&error, r));
- return r;
- }
-
- free(s->scope_job);
- s->scope_job = job;
- } else {
- r = manager_abandon_scope(s->manager, s->scope, &error);
- if (r < 0) {
- log_error("Failed to abandon session scope: %s", bus_error_message(&error, r));
+ r = session_kill(s, KILL_ALL, SIGTERM);
+ if (r < 0)
return r;
- }
}
return 0;
session_remove_fifo(s);
/* Kill cgroup */
- r = session_stop_scope(s, force);
+ r = session_stop_cgroup(s, force);
s->stopping = true;
return r;
}
-static int release_timeout_callback(sd_event_source *es, uint64_t usec, void *userdata) {
- Session *s = userdata;
-
- assert(es);
- assert(s);
-
- session_stop(s, false);
- return 0;
-}
-
int session_release(Session *s) {
assert(s);
if (s->timer_event_source)
return 0;
- return sd_event_add_time(s->manager->event,
- &s->timer_event_source,
- CLOCK_MONOTONIC,
- now(CLOCK_MONOTONIC) + RELEASE_USEC, 0,
- release_timeout_callback, s);
+ /* In systemd, session release is triggered by user jobs
+ dying. In elogind we don't have that so go ahead and stop
+ now. */
+ return session_stop(s, false);
}
bool session_is_active(Session *s) {
return true;
}
- if (s->scope_job && manager_job_is_active(s->manager, s->scope_job))
- return true;
-
- if (s->scope && manager_unit_is_active(s->manager, s->scope))
+ if (cg_is_empty_recursive (SYSTEMD_CGROUP_CONTROLLER, s->id, false) > 0)
return true;
return false;
if (s->stopping || s->timer_event_source)
return SESSION_CLOSING;
- if (s->scope_job || s->fifo_fd < 0)
+ if (s->fifo_fd < 0)
return SESSION_OPENING;
if (session_is_active(s))
int session_kill(Session *s, KillWho who, int signo) {
assert(s);
- if (!s->scope)
- return -ESRCH;
+ if (who == KILL_LEADER) {
+ if (s->leader <= 0)
+ return -ESRCH;
+
+ /* FIXME: verify that leader is in cgroup? */
- return manager_kill_unit(s->manager, s->scope, who, signo, NULL);
+ if (kill(s->leader, signo) < 0) {
+ return log_error_errno(errno, "Failed to kill process leader %d for session %s: %m", s->leader, s->id);
+ }
+ return 0;
+ } else {
+ bool sigcont = false;
+ bool ignore_self = true;
+ bool rem = true;
+ return cg_kill_recursive (SYSTEMD_CGROUP_CONTROLLER, s->id, signo,
+ sigcont, ignore_self, rem, NULL);
+ }
}
static int session_open_vt(Session *s) {
~ianmdlvl / elogind.git / blobdiff