unit: use the UNIT() macro consistently

[elogind.git] / src / snapshot.c

diff --git a/src/snapshot.c b/src/snapshot.c
index ea3894bb91b33b1f52c3a280ab30be986648ad80..82ec5104dbfa07bd81085e32fefd8ae950864783 100644 (file)
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
   This file is part of systemd.
@@ -25,12 +25,23 @@
 #include "snapshot.h"
 #include "unit-name.h"
 #include "dbus-snapshot.h"
+#include "bus-errors.h"
 
 static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
         [SNAPSHOT_DEAD] = UNIT_INACTIVE,
         [SNAPSHOT_ACTIVE] = UNIT_ACTIVE
 };
 
+static void snapshot_init(Unit *u) {
+        Snapshot *s = SNAPSHOT(u);
+
+        assert(s);
+        assert(UNIT(s)->load_state == UNIT_STUB);
+
+        UNIT(s)->ignore_on_isolate = true;
+        UNIT(s)->ignore_on_snapshot = true;
+}
+
 static void snapshot_set_state(Snapshot *s, SnapshotState state) {
         SnapshotState old_state;
         assert(s);
@@ -40,11 +51,26 @@ static void snapshot_set_state(Snapshot *s, SnapshotState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          s->meta.id,
+                          UNIT(s)->id,
                           snapshot_state_to_string(old_state),
                           snapshot_state_to_string(state));
 
-        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]);
+        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
+}
+
+static int snapshot_load(Unit *u) {
+        Snapshot *s = SNAPSHOT(u);
+
+        assert(u);
+        assert(u->load_state == UNIT_STUB);
+
+        /* Make sure that only snapshots created via snapshot_create()
+         * can be loaded */
+        if (!s->by_snapshot_create && UNIT(s)->manager->n_reloading <= 0)
+                return -ENOENT;
+
+        u->load_state = UNIT_LOADED;
+        return 0;
 }
 
 static int snapshot_coldplug(Unit *u) {
@@ -107,8 +133,8 @@ static int snapshot_serialize(Unit *u, FILE *f, FDSet *fds) {
 
         unit_serialize_item(u, f, "state", snapshot_state_to_string(s->state));
         unit_serialize_item(u, f, "cleanup", yes_no(s->cleanup));
-        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i)
-                unit_serialize_item(u, f, "requires", other->meta.id);
+        SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
+                unit_serialize_item(u, f, "wants", other->id);
 
         return 0;
 }
@@ -137,12 +163,9 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
                 else
                         s->cleanup = r;
 
-        } else if (streq(key, "requires")) {
-
-                if ((r = unit_add_dependency_by_name(u, UNIT_AFTER, value, NULL, true)) < 0)
-                        return r;
+        } else if (streq(key, "wants")) {
 
-                if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, value, NULL, true)) < 0)
+                if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, value, NULL, true)) < 0)
                         return r;
         } else
                 log_debug("Unknown serialization key '%s'", key);
@@ -162,7 +185,7 @@ static const char *snapshot_sub_state_to_string(Unit *u) {
         return snapshot_state_to_string(SNAPSHOT(u)->state);
 }
 
-int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
+int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Snapshot **_s) {
         Iterator i;
         Unit *other, *u = NULL;
         char *n = NULL;
@@ -173,14 +196,20 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
         assert(_s);
 
         if (name) {
-                if (!unit_name_is_valid(name))
+                if (!unit_name_is_valid(name, false)) {
+                        dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name);
                         return -EINVAL;
+                }
 
-                if (unit_name_to_type(name) != UNIT_SNAPSHOT)
+                if (unit_name_to_type(name) != UNIT_SNAPSHOT) {
+                        dbus_set_error(e, BUS_ERROR_UNIT_TYPE_MISMATCH, "Unit name %s lacks snapshot suffix.", name);
                         return -EINVAL;
+                }
 
-                if (manager_get_unit(m, name))
+                if (manager_get_unit(m, name)) {
+                        dbus_set_error(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name);
                         return -EEXIST;
+                }
 
         } else {
 
@@ -197,18 +226,22 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
                 name = n;
         }
 
-        r = manager_load_unit(m, name, NULL, &u);
+        r = manager_load_unit_prepare(m, name, NULL, e, &u);
         free(n);
 
         if (r < 0)
                 goto fail;
 
+        SNAPSHOT(u)->by_snapshot_create = true;
+        manager_dispatch_load_queue(m);
+        assert(u->load_state == UNIT_LOADED);
+
         HASHMAP_FOREACH_KEY(other, k, m->units, i) {
 
-                if (UNIT_VTABLE(other)->no_snapshots)
+                if (other->ignore_on_snapshot)
                         continue;
 
-                if (k != other->meta.id)
+                if (k != other->id)
                         continue;
 
                 if (UNIT_VTABLE(other)->check_snapshot)
@@ -218,10 +251,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
                 if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
                         continue;
 
-                if ((r = unit_add_dependency(u, UNIT_REQUIRES, other, true)) < 0)
-                        goto fail;
-
-                if ((r = unit_add_dependency(u, UNIT_AFTER, other, true)) < 0)
+                if ((r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, other, true)) < 0)
                         goto fail;
         }
 
@@ -252,13 +282,15 @@ DEFINE_STRING_TABLE_LOOKUP(snapshot_state, SnapshotState);
 
 const UnitVTable snapshot_vtable = {
         .suffix = ".snapshot",
+        .object_size = sizeof(Snapshot),
 
         .no_alias = true,
         .no_instances = true,
-        .no_snapshots = true,
         .no_gc = true,
 
-        .load = unit_load_nop,
+        .init = snapshot_init,
+
+        .load = snapshot_load,
         .coldplug = snapshot_coldplug,
 
         .dump = snapshot_dump,
@@ -272,5 +304,6 @@ const UnitVTable snapshot_vtable = {
         .active_state = snapshot_active_state,
         .sub_state_to_string = snapshot_sub_state_to_string,
 
+        .bus_interface = "org.freedesktop.systemd1.Snapshot",
         .bus_message_handler = bus_snapshot_message_handler
 };