+/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <errno.h>
#include "bus-error.h"
#include "bus-util.h"
#include "escape.h"
-#include "extract-word.h"
#include "fd-util.h"
#include "fileio.h"
#include "format-util.h"
#include "terminal-util.h"
#include "user-util.h"
#include "util.h"
+
+/// Additional includes needed by elogind
+#include "extract-word.h"
#include "process-util.h"
#define RELEASE_USEC (20*USEC_PER_SEC)
if (!s->started)
return 0;
- r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0);
+ r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0, MKDIR_WARN_MODE);
if (r < 0)
goto fail;
if (s->desktop) {
_cleanup_free_ char *escaped;
-
escaped = cescape(s->desktop);
if (!escaped) {
r = -ENOMEM;
assert(s);
- r = parse_env_file(s->state_file, NEWLINE,
+ r = parse_env_file(NULL, s->state_file, NEWLINE,
"REMOTE", &remote,
"SCOPE", &s->scope,
#if 0 /// elogind does not support systemd scope_jobs
}
#if 0 /// UNNEEDED by elogind
-static int session_start_scope(Session *s) {
+static int session_start_scope(Session *s, sd_bus_message *properties) {
int r;
assert(s);
description,
"systemd-logind.service",
"systemd-user-sessions.service",
- (uint64_t) -1, /* disable TasksMax= for the scope, rely on the slice setting for it */
+ properties,
&error,
&job);
if (r < 0) {
}
#endif // 0
-int session_start(Session *s) {
+int session_start(Session *s, sd_bus_message *properties) {
int r;
assert(s);
/* Create cgroup */
#if 0 /// elogind does its own session management
- r = session_start_scope(s);
+ r = session_start_scope(s, properties);
#else
r = session_start_cgroup(s);
#endif // 0
"SESSION_ID=%s", s->id,
"USER_ID=%s", s->user->name,
"LEADER="PID_FMT, s->leader,
- LOG_MESSAGE("New session %s of user %s.", s->id, s->user->name),
- NULL);
+ LOG_MESSAGE("New session %s of user %s.", s->id, s->user->name));
if (!dual_timestamp_is_set(&s->timestamp))
dual_timestamp_get(&s->timestamp);
free(s->scope_job);
s->scope_job = job;
- } else
+ } else {
s->scope_job = mfree(s->scope_job);
+ /* With no killing, this session is allowed to persist in "closing" state indefinitely.
+ * Therefore session stop and session removal may be two distinct events.
+ * Session stop is quite significant on its own, let's log it. */
+ log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
+ "SESSION_ID=%s", s->id,
+ "USER_ID=%s", s->user->name,
+ "LEADER="PID_FMT, s->leader,
+ LOG_MESSAGE("Session %s logged out. Waiting for processes to exit.", s->id));
+ }
+
return 0;
}
#else
assert(s);
- if (force || manager_shall_kill(s->manager, s->user->name)) {
- r = session_kill(s, KILL_ALL, SIGTERM);
- if (r < 0)
- return r;
- }
-
- return 0;
-}
-#endif // 0
int session_stop(Session *s, bool force) {
int r;
session_remove_fifo(s);
/* Kill cgroup */
-#if 0 /// elogind does not start scopes, but sessions
r = session_stop_scope(s, force);
-#else
- r = session_stop_cgroup(s, force);
-#endif // 0
s->stopping = true;
session_save(s);
user_save(s->user);
-#if 1 /// elogind must queue this session again
- session_add_to_gc_queue(s);
-#endif // 1
return r;
}
"LEADER="PID_FMT, s->leader,
LOG_MESSAGE("Removed session %s.", s->id),
NULL);
+ LOG_MESSAGE("Removed session %s.", s->id));
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
/* Create FIFO */
if (!s->fifo_path) {
- r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0);
+ r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0, false);
+ r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0, 0);
+ r = mkdir_safe_label("/run/systemd/sessions", 0755, 0, 0, MKDIR_WARN_MODE);
if (r < 0)
return r;
/* Open reading side */
if (s->fifo_fd < 0) {
- s->fifo_fd = open(s->fifo_path, O_RDONLY|O_CLOEXEC|O_NDELAY);
+ s->fifo_fd = open(s->fifo_path, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
if (s->fifo_fd < 0)
return -errno;
}
/* Open writing side */
- r = open(s->fifo_path, O_WRONLY|O_CLOEXEC|O_NDELAY);
+ r = open(s->fifo_path, O_WRONLY|O_CLOEXEC|O_NONBLOCK);
if (r < 0)
return -errno;
}
}
-bool session_check_gc(Session *s, bool drop_not_started) {
+bool session_may_gc(Session *s, bool drop_not_started) {
assert(s);
if (drop_not_started && !s->started)
- return false;
+ return true;
if (!s->user)
- return false;
+ return true;
if (s->fifo_fd >= 0) {
if (pipe_eof(s->fifo_fd) <= 0)
- return true;
+ return false;
}
-#if 0 /// elogind supports neither scopes nor jobs
if (s->scope_job && manager_job_is_active(s->manager, s->scope_job))
- return true;
+ return false;
if (s->scope && manager_unit_is_active(s->manager, s->scope))
- return true;
-#endif // 0
+ return false;
- return false;
+ return true;
}
void session_add_to_gc_queue(Session *s) {
if (s->stopping || s->timer_event_source)
return SESSION_CLOSING;
-#if 0 /// elogind does not support systemd scope_jobs
if (s->scope_job || s->fifo_fd < 0)
-#else
- if (s->fifo_fd < 0)
-#endif // 0
return SESSION_OPENING;
if (session_is_active(s))
int session_kill(Session *s, KillWho who, int signo) {
assert(s);
-#if 0 /// Without direct cgroup support, elogind can not kill sessions
if (!s->scope)
return -ESRCH;
return manager_kill_unit(s->manager, s->scope, who, signo, NULL);
-#else
- if (who == KILL_LEADER) {
- if (s->leader <= 0)
- return -ESRCH;
-
- /* FIXME: verify that leader is in cgroup? */
-
- 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
- return cg_kill_recursive (SYSTEMD_CGROUP_CONTROLLER, s->id, signo,
- CGROUP_IGNORE_SELF | CGROUP_REMOVE,
- NULL, NULL, NULL);
-#endif // 0
}
static int session_open_vt(Session *s) {
.mode = VT_AUTO,
};
- _cleanup_free_ char *utf8 = NULL;
int vt, old_fd;
/* We need to get a fresh handle to the virtual terminal,
*/
old_fd = s->vtfd;
s->vtfd = -1;
+ old_fd = TAKE_FD(s->vtfd);
vt = session_open_vt(s);
safe_close(old_fd);
session_release_controller(s, true);
s->controller = name;
name = NULL;
+ s->controller = TAKE_PTR(name);
session_save(s);
return 0;
~ianmdlvl / elogind.git / blobdiff