Update some message formats

[elogind.git] / src / machine / machine.c

diff --git a/src/machine/machine.c b/src/machine/machine.c
index a33a111043c586b81c1eb9edd0149d16ae35a96a..0791ba8a9a538d19fd498df0e1a5191d2c1ee81c 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -85,6 +85,9 @@ void machine_free(Machine *m) {
 
         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);
@@ -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;
 }
@@ -263,6 +266,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)