#include <sys/ioctl.h>
#include <unistd.h>
-#include "sd-id128.h"
#include "sd-messages.h"
-#include "strv.h"
#include "util.h"
#include "mkdir.h"
#include "path-util.h"
#include "bus-error.h"
#include "logind-session.h"
-#define RELEASE_USEC (20*USEC_PER_SEC)
-
static void session_remove_fifo(Session *s);
Session* session_new(Manager *m, const char *id) {
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);
_cleanup_free_ char *remote = NULL,
*seat = NULL,
*vtnr = NULL,
+ *state = NULL,
*pos = NULL,
*leader = NULL,
*type = NULL,
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,
"SERVICE", &s->service,
"DESKTOP", &s->desktop,
"VTNR", &vtnr,
+ "STATE", &state,
"POS", &pos,
"LEADER", &leader,
"TYPE", &type,
s->class = c;
}
+ if (state && streq(state, "closing"))
+ s->stopping = true;
+
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. */
+ writing, but close it right away which then will
+ trigger the EOF. This will happen immediately if no
+ other process has the FIFO open for writing, i. e.
+ when the session died before logind (re)started. */
fd = session_create_fifo(s);
safe_close(fd);
assert(s->user);
if (!s->seat)
- return -ENOTSUP;
+ return -EOPNOTSUPP;
if (s->seat->active == s)
return 0;
/* on seats with VTs, we let VTs manage session-switching */
if (seat_has_vts(s->seat)) {
if (!s->vtnr)
- return -ENOTSUP;
+ return -EOPNOTSUPP;
return chvt(s->vtnr);
}
return 0;
}
-static int session_start_scope(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;
-
- free(s->scope_job);
- s->scope_job = job;
- }
- }
-
- if (s->scope)
- hashmap_put(s->manager->session_units, s->scope, s);
-
- return 0;
-}
-
int session_start(Session *s) {
int r;
if (r < 0)
return r;
- /* Create cgroup */
- r = session_start_scope(s);
- if (r < 0)
- return r;
-
log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SESSION_START),
"SESSION_ID=%s", s->id,
return 0;
}
-static int session_stop_scope(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));
- return r;
- }
- }
-
- return 0;
-}
-
int session_stop(Session *s, bool force) {
- int r;
+ int r = 0;
assert(s);
/* We are going down, don't care about FIFOs anymore */
session_remove_fifo(s);
- /* Kill cgroup */
- r = session_stop_scope(s, force);
-
s->stopping = true;
user_elect_display(s->user);
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;
-}
-
-void session_release(Session *s) {
+int session_release(Session *s) {
assert(s);
if (!s->started || s->stopping)
- return;
+ return 0;
+
+ if (s->timer_event_source)
+ return 0;
- if (!s->timer_event_source)
- 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. */
+ 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))
- 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;
-
- return manager_kill_unit(s->manager, s->scope, who, signo, NULL);
+ /* No way to kill the session without cgroups. */
+ return -ESRCH;
}
static int session_open_vt(Session *s) {
if (vt < 0)
return;
- ioctl(vt, KDSETMODE, KD_TEXT);
+ (void) ioctl(vt, KDSETMODE, KD_TEXT);
if (read_one_line_file("/sys/module/vt/parameters/default_utf8", &utf8) >= 0 && *utf8 == '1')
kb = K_UNICODE;
- ioctl(vt, KDSKBMODE, kb);
+ (void) ioctl(vt, KDSKBMODE, kb);
mode.mode = VT_AUTO;
- ioctl(vt, VT_SETMODE, &mode);
+ (void) ioctl(vt, VT_SETMODE, &mode);
fchown(vt, 0, -1);
~ianmdlvl / elogind.git / blobdiff