X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachine.c;h=9a5cc9a63c4eb1f017d0c8a2196c14ec6ce9c833;hb=67608cad2301f9ab5c92336992c176505640f2ba;hp=be669f02dcf59dcb6258ba6d858660936ec9d3ac;hpb=c335068380fe8c9d843cdb2cf8a00f822cfabed3;p=elogind.git diff --git a/src/machine/machine.c b/src/machine/machine.c index be669f02d..9a5cc9a63 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -76,15 +76,18 @@ void machine_free(Machine *m) { if (m->in_gc_queue) LIST_REMOVE(gc_queue, m->manager->machine_gc_queue, m); - if (m->scope) { - hashmap_remove(m->manager->machine_units, m->scope); - free(m->scope); + if (m->unit) { + hashmap_remove(m->manager->machine_units, m->unit); + free(m->unit); } free(m->scope_job); hashmap_remove(m->manager->machines, m->name); + if (m->leader > 0) + hashmap_remove_value(m->manager->machine_leaders, UINT_TO_PTR(m->leader), m); + sd_bus_message_unref(m->create_message); free(m->name); @@ -120,8 +123,8 @@ int machine_save(Machine *m) { "NAME=%s\n", m->name); - if (m->scope) - fprintf(f, "SCOPE=%s\n", m->scope); + if (m->unit) + fprintf(f, "SCOPE=%s\n", m->unit); /* We continue to call this "SCOPE=" because it is internal only, and we want to stay compatible with old files */ if (m->scope_job) fprintf(f, "SCOPE_JOB=%s\n", m->scope_job); @@ -136,17 +139,17 @@ int machine_save(Machine *m) { fprintf(f, "ID=" SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(m->id)); if (m->leader != 0) - fprintf(f, "LEADER=%lu\n", (unsigned long) m->leader); + fprintf(f, "LEADER="PID_FMT"\n", m->leader); if (m->class != _MACHINE_CLASS_INVALID) fprintf(f, "CLASS=%s\n", machine_class_to_string(m->class)); if (dual_timestamp_is_set(&m->timestamp)) fprintf(f, - "REALTIME=%llu\n" - "MONOTONIC=%llu\n", - (unsigned long long) m->timestamp.realtime, - (unsigned long long) m->timestamp.monotonic); + "REALTIME="USEC_FMT"\n" + "MONOTONIC="USEC_FMT"\n", + m->timestamp.realtime, + m->timestamp.monotonic); fflush(f); @@ -156,13 +159,38 @@ int machine_save(Machine *m) { unlink(temp_path); } + if (m->unit) { + char *sl; + + /* Create a symlink from the unit name to the machine + * name, so that we can quickly find the machine for + * each given unit */ + sl = strappenda("/run/systemd/machines/unit:", m->unit); + symlink(m->name, sl); + } + finish: if (r < 0) - log_error("Failed to save machine data for %s: %s", m->name, strerror(-r)); + log_error("Failed to save machine data %s: %s", m->state_file, strerror(-r)); return r; } +static void machine_unlink(Machine *m) { + assert(m); + + if (m->unit) { + + char *sl; + + sl = strappenda("/run/systemd/machines/unit:", m->unit); + unlink(sl); + } + + if (m->state_file) + unlink(m->state_file); +} + int machine_load(Machine *m) { _cleanup_free_ char *realtime = NULL, *monotonic = NULL, *id = NULL, *leader = NULL, *class = NULL; int r; @@ -170,7 +198,7 @@ int machine_load(Machine *m) { assert(m); r = parse_env_file(m->state_file, NEWLINE, - "SCOPE", &m->scope, + "SCOPE", &m->unit, "SCOPE_JOB", &m->scope_job, "SERVICE", &m->service, "ROOT", &m->root_directory, @@ -222,9 +250,9 @@ static int machine_start_scope(Machine *m, sd_bus_message *properties, sd_bus_er assert(m); - if (!m->scope) { + if (!m->unit) { _cleanup_free_ char *escaped = NULL; - char *scope, *description, *job; + char *scope, *description, *job = NULL; escaped = unit_name_escape(m->name); if (!escaped) @@ -242,15 +270,15 @@ static int machine_start_scope(Machine *m, sd_bus_message *properties, sd_bus_er free(scope); return r; } else { - m->scope = scope; + m->unit = scope; free(m->scope_job); m->scope_job = job; } } - if (m->scope) - hashmap_put(m->manager->machine_units, m->scope, m); + if (m->unit) + hashmap_put(m->manager->machine_units, m->unit, m); return r; } @@ -263,6 +291,10 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) { if (m->started) return 0; + r = hashmap_put(m->manager->machine_leaders, UINT_TO_PTR(m->leader), m); + if (r < 0) + return r; + /* Create cgroup */ r = machine_start_scope(m, properties, error); if (r < 0) @@ -290,15 +322,15 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) { static int machine_stop_scope(Machine *m) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - char *job; + char *job = NULL; int r; assert(m); - if (!m->scope) + if (!m->unit) return 0; - r = manager_stop_unit(m->manager, m->scope, &error, &job); + r = manager_stop_unit(m->manager, m->unit, &error, &job); if (r < 0) { log_error("Failed to stop machine scope: %s", bus_error_message(&error, r)); return r; @@ -327,7 +359,7 @@ int machine_stop(Machine *m) { if (k < 0) r = k; - unlink(m->state_file); + machine_unlink(m); machine_add_to_gc_queue(m); if (m->started) @@ -338,7 +370,7 @@ int machine_stop(Machine *m) { return r; } -int machine_check_gc(Machine *m, bool drop_not_started) { +bool machine_check_gc(Machine *m, bool drop_not_started) { assert(m); if (drop_not_started && !m->started) @@ -347,7 +379,7 @@ int machine_check_gc(Machine *m, bool drop_not_started) { if (m->scope_job && manager_job_is_active(m->manager, m->scope_job)) return true; - if (m->scope && manager_unit_is_active(m->manager, m->scope)) + if (m->unit && manager_unit_is_active(m->manager, m->unit)) return true; return false; @@ -375,10 +407,18 @@ MachineState machine_get_state(Machine *s) { int machine_kill(Machine *m, KillWho who, int signo) { assert(m); - if (!m->scope) + if (!m->unit) return -ESRCH; - return manager_kill_unit(m->manager, m->scope, who, signo, NULL); + if (who == KILL_LEADER) { + /* If we shall simply kill the leader, do so directly */ + + if (kill(m->leader, signo) < 0) + return -errno; + } + + /* Otherwise make PID 1 do it for us, for the entire cgroup */ + return manager_kill_unit(m->manager, m->unit, signo, NULL); } static const char* const machine_class_table[_MACHINE_CLASS_MAX] = {