X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine%2Fmachine.c;h=0791ba8a9a538d19fd498df0e1a5191d2c1ee81c;hp=591a656f1ea192262dbb8ed57349ef4fe2307767;hb=90b2de37b80603168f4e9c9c81cff7eea4efa21a;hpb=f2d4f98d5873e0649b79b04b967fc9625ab3a350 diff --git a/src/machine/machine.c b/src/machine/machine.c index 591a656f1..0791ba8a9 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -23,7 +23,7 @@ #include #include -#include +#include "sd-messages.h" #include "util.h" #include "mkdir.h" @@ -32,8 +32,9 @@ #include "fileio.h" #include "special.h" #include "unit-name.h" -#include "dbus-common.h" #include "machine.h" +#include "bus-util.h" +#include "bus-error.h" Machine* machine_new(Manager *manager, const char *name) { Machine *m; @@ -73,7 +74,7 @@ void machine_free(Machine *m) { assert(m); if (m->in_gc_queue) - LIST_REMOVE(Machine, gc_queue, m->manager->machine_gc_queue, m); + LIST_REMOVE(gc_queue, m->manager->machine_gc_queue, m); if (m->scope) { hashmap_remove(m->manager->machine_units, m->scope); @@ -84,8 +85,10 @@ void machine_free(Machine *m) { hashmap_remove(m->manager->machines, m->name); - if (m->create_message) - dbus_message_unref(m->create_message); + 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); free(m->state_file); @@ -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); @@ -158,7 +161,7 @@ int machine_save(Machine *m) { 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; } @@ -217,19 +220,14 @@ int machine_load(Machine *m) { return r; } -static int machine_start_scope(Machine *m) { - _cleanup_free_ char *description = NULL; - DBusError error; - char *job; +static int machine_start_scope(Machine *m, sd_bus_message *properties, sd_bus_error *error) { int r = 0; assert(m); - dbus_error_init(&error); - if (!m->scope) { _cleanup_free_ char *escaped = NULL; - char *scope; + char *scope, *description, *job; escaped = unit_name_escape(m->name); if (!escaped) @@ -239,13 +237,11 @@ static int machine_start_scope(Machine *m) { if (!scope) return log_oom(); - description = strappend(m->class == MACHINE_VM ? "Virtual Machine " : "Container ", m->name); + description = strappenda(m->class == MACHINE_VM ? "Virtual Machine " : "Container ", m->name); - r = manager_start_scope(m->manager, scope, m->leader, SPECIAL_MACHINE_SLICE, description, &error, &job); + r = manager_start_scope(m->manager, scope, m->leader, SPECIAL_MACHINE_SLICE, description, properties, error, &job); if (r < 0) { - log_error("Failed to start machine scope: %s", bus_error(&error, r)); - dbus_error_free(&error); - + log_error("Failed to start machine scope: %s", bus_error_message(error, r)); free(scope); return r; } else { @@ -262,7 +258,7 @@ static int machine_start_scope(Machine *m) { return r; } -int machine_start(Machine *m) { +int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) { int r; assert(m); @@ -270,8 +266,12 @@ int machine_start(Machine *m) { 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); + r = machine_start_scope(m, properties, error); if (r < 0) return r; @@ -296,21 +296,18 @@ int machine_start(Machine *m) { } static int machine_stop_scope(Machine *m) { - DBusError error; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *job; int r; assert(m); - dbus_error_init(&error); - if (!m->scope) return 0; r = manager_stop_unit(m->manager, m->scope, &error, &job); if (r < 0) { - log_error("Failed to stop machine scope: %s", bus_error(&error, r)); - dbus_error_free(&error); + log_error("Failed to stop machine scope: %s", bus_error_message(&error, r)); return r; } @@ -348,19 +345,19 @@ 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) - return 0; + return false; - if (m->scope_job) - return 1; + if (m->scope_job && manager_job_is_active(m->manager, m->scope_job)) + return true; - if (m->scope) - return manager_unit_is_active(m->manager, m->scope) != 0; + if (m->scope && manager_unit_is_active(m->manager, m->scope)) + return true; - return 0; + return false; } void machine_add_to_gc_queue(Machine *m) { @@ -369,7 +366,7 @@ void machine_add_to_gc_queue(Machine *m) { if (m->in_gc_queue) return; - LIST_PREPEND(Machine, gc_queue, m->manager->machine_gc_queue, m); + LIST_PREPEND(gc_queue, m->manager->machine_gc_queue, m); m->in_gc_queue = true; }