X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-session.c;h=d7c074bdce8b4022bcbdf1675793b57fd944ff20;hp=4f3259ca7cd6f3edf7cfa69ab08f1cef4fd59e0d;hb=8fe63cd4f16e1e7cdf528ff053f8eb4da7848455;hpb=d9eb81f9844f6d28b52e44b2c0e6e280a61d8200 diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 4f3259ca7..d7c074bdc 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -40,6 +40,10 @@ #include "bus-error.h" #include "logind-session.h" +#define RELEASE_USEC (20*USEC_PER_SEC) + +static void session_remove_fifo(Session *s); + static unsigned long devt_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) { uint64_t u = *(const dev_t*)p; @@ -103,6 +107,8 @@ void session_free(Session *s) { if (s->in_gc_queue) LIST_REMOVE(gc_queue, s->manager->session_gc_queue, s); + s->timer_event_source = sd_event_source_unref(s->timer_event_source); + session_remove_fifo(s); session_drop_controller(s); @@ -143,9 +149,12 @@ void session_free(Session *s) { free(s->remote_host); free(s->remote_user); free(s->service); + free(s->desktop); hashmap_remove(s->manager->sessions, s->id); + s->vt_source = sd_event_source_unref(s->vt_source); + free(s->state_file); free(s); } @@ -185,12 +194,12 @@ int session_save(Session *s) { fprintf(f, "# This is private data. Do not parse.\n" - "UID=%lu\n" + "UID="UID_FMT"\n" "USER=%s\n" "ACTIVE=%i\n" "STATE=%s\n" "REMOTE=%i\n", - (unsigned long) s->user->uid, + s->user->uid, s->user->name, session_is_active(s), session_state_to_string(session_get_state(s)), @@ -229,6 +238,9 @@ int session_save(Session *s) { if (s->service) fprintf(f, "SERVICE=%s\n", s->service); + if (s->desktop) + fprintf(f, "DESKTOP=%s\n", s->desktop); + if (s->seat && seat_has_vts(s->seat)) fprintf(f, "VTNR=%u\n", s->vtnr); @@ -236,17 +248,17 @@ int session_save(Session *s) { fprintf(f, "POS=%u\n", s->pos); if (s->leader > 0) - fprintf(f, "LEADER=%lu\n", (unsigned long) s->leader); + fprintf(f, "LEADER="PID_FMT"\n", s->leader); if (s->audit_id > 0) fprintf(f, "AUDIT=%"PRIu32"\n", s->audit_id); if (dual_timestamp_is_set(&s->timestamp)) fprintf(f, - "REALTIME=%llu\n" - "MONOTONIC=%llu\n", - (unsigned long long) s->timestamp.realtime, - (unsigned long long) s->timestamp.monotonic); + "REALTIME="USEC_FMT"\n" + "MONOTONIC="USEC_FMT"\n", + s->timestamp.realtime, + s->timestamp.monotonic); if (s->controller) fprintf(f, "CONTROLLER=%s\n", s->controller); @@ -261,7 +273,7 @@ int session_save(Session *s) { finish: if (r < 0) - log_error("Failed to save session data for %s: %s", s->id, strerror(-r)); + log_error("Failed to save session data %s: %s", s->state_file, strerror(-r)); return r; } @@ -294,6 +306,7 @@ int session_load(Session *s) { "REMOTE_HOST", &s->remote_host, "REMOTE_USER", &s->remote_user, "SERVICE", &s->service, + "DESKTOP", &s->desktop, "VTNR", &vtnr, "POS", &pos, "LEADER", &leader, @@ -467,7 +480,6 @@ static int session_start_scope(Session *s) { if (!s->scope) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_free_ char *description = NULL; - const char *kill_mode; char *scope, *job; description = strjoin("Session ", s->id, " of user ", s->user->name, NULL); @@ -478,9 +490,7 @@ static int session_start_scope(Session *s) { if (!scope) return log_oom(); - kill_mode = manager_shall_kill(s->manager, s->user->name) ? "control-group" : "none"; - - r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-user-sessions.service", kill_mode, &error, &job); + r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-session.service", &error, &job); if (r < 0) { log_error("Failed to start session scope %s: %s %s", scope, bus_error_message(&error, r), error.name); @@ -536,27 +546,26 @@ int session_start(Session *s) { s->started = true; - /* Save session data */ + /* Save data */ session_save(s); user_save(s->user); + if (s->seat) + seat_save(s->seat); + /* Send signals */ session_send_signal(s, true); - + user_send_changed(s->user, "Sessions", NULL); if (s->seat) { - seat_save(s->seat); - if (s->seat->active == s) seat_send_changed(s->seat, "Sessions", "ActiveSession", NULL); else seat_send_changed(s->seat, "Sessions", NULL); } - user_send_changed(s->user, "Sessions", NULL); - return 0; } -static int session_stop_scope(Session *s) { +static int session_stop_scope(Session *s, bool force) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *job; int r; @@ -566,19 +575,27 @@ static int session_stop_scope(Session *s) { if (!s->scope) return 0; - 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; - } + 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; + 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) { +int session_stop(Session *s, bool force) { int r; assert(s); @@ -586,8 +603,15 @@ int session_stop(Session *s) { if (!s->user) return -ESTALE; + s->timer_event_source = sd_event_source_unref(s->timer_event_source); + + /* We are going down, don't care about FIFOs anymore */ + session_remove_fifo(s); + /* Kill cgroup */ - r = session_stop_scope(s); + r = session_stop_scope(s, force); + + s->stopping = true; session_save(s); user_save(s->user); @@ -613,6 +637,8 @@ int session_finalize(Session *s) { "MESSAGE=Removed session %s.", s->id, NULL); + s->timer_event_source = sd_event_source_unref(s->timer_event_source); + /* Kill session devices */ while ((sd = hashmap_first(s->devices))) session_device_free(sd); @@ -630,16 +656,36 @@ int session_finalize(Session *s) { if (s->seat->active == s) seat_set_active(s->seat, NULL); - seat_send_changed(s->seat, "Sessions", NULL); seat_save(s->seat); + seat_send_changed(s->seat, "Sessions", NULL); } - user_send_changed(s->user, "Sessions", NULL); user_save(s->user); + user_send_changed(s->user, "Sessions", NULL); 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) { + assert(s); + + if (!s->started || s->stopping) + return; + + if (!s->timer_event_source) + sd_event_add_monotonic(s->manager->event, now(CLOCK_MONOTONIC) + RELEASE_USEC, 0, release_timeout_callback, s, &s->timer_event_source); +} + bool session_is_active(Session *s) { assert(s); @@ -766,7 +812,7 @@ static int session_dispatch_fifo(sd_event_source *es, int fd, uint32_t revents, /* EOF on the FIFO means the session died abnormally. */ session_remove_fifo(s); - session_stop(s); + session_stop(s, false); return 1; } @@ -815,7 +861,7 @@ int session_create_fifo(Session *s) { return r; } -void session_remove_fifo(Session *s) { +static void session_remove_fifo(Session *s) { assert(s); if (s->fifo_event_source) @@ -834,8 +880,6 @@ void session_remove_fifo(Session *s) { } bool session_check_gc(Session *s, bool drop_not_started) { - int r; - assert(s); if (drop_not_started && !s->started) @@ -845,11 +889,7 @@ bool session_check_gc(Session *s, bool drop_not_started) { return false; if (s->fifo_fd >= 0) { - r = pipe_eof(s->fifo_fd); - if (r < 0) - return true; - - if (r == 0) + if (pipe_eof(s->fifo_fd) <= 0) return true; } @@ -875,12 +915,13 @@ void session_add_to_gc_queue(Session *s) { SessionState session_get_state(Session *s) { assert(s); - if (s->scope_job) - return SESSION_OPENING; - - if (s->fifo_fd < 0) + /* always check closing first */ + if (s->stopping || s->timer_event_source) return SESSION_CLOSING; + if (s->scope_job || s->fifo_fd < 0) + return SESSION_OPENING; + if (session_is_active(s)) return SESSION_ACTIVE; @@ -897,7 +938,7 @@ int session_kill(Session *s, KillWho who, int signo) { } static int session_open_vt(Session *s) { - char path[128]; + char path[sizeof("/dev/tty") + DECIMAL_STR_MAX(s->vtnr)]; if (!s->vtnr) return -1; @@ -975,8 +1016,7 @@ void session_restore_vt(Session *s) { if (vt < 0) return; - sd_event_source_unref(s->vt_source); - s->vt_source = NULL; + s->vt_source = sd_event_source_unref(s->vt_source); ioctl(vt, KDSETMODE, KD_TEXT);