chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: let's simplify things by getting rid of unnecessary bus parameters
[elogind.git]
/
src
/
core
/
snapshot.c
diff --git
a/src/core/snapshot.c
b/src/core/snapshot.c
index a3f5e908ebcf9346a7a173a187ffe7e3fa0cce48..21e89ac9964a7f07ed7caee2c962b3563909f928 100644
(file)
--- a/
src/core/snapshot.c
+++ b/
src/core/snapshot.c
@@
-40,6
+40,7
@@
static void snapshot_init(Unit *u) {
UNIT(s)->ignore_on_isolate = true;
UNIT(s)->ignore_on_snapshot = true;
UNIT(s)->ignore_on_isolate = true;
UNIT(s)->ignore_on_snapshot = true;
+ UNIT(s)->allow_isolate = true;
}
static void snapshot_set_state(Snapshot *s, SnapshotState state) {
}
static void snapshot_set_state(Snapshot *s, SnapshotState state) {
@@
-66,7
+67,7
@@
static int snapshot_load(Unit *u) {
/* Make sure that only snapshots created via snapshot_create()
* can be loaded */
/* Make sure that only snapshots created via snapshot_create()
* can be loaded */
- if (!
s->by_snapshot_create
&& UNIT(s)->manager->n_reloading <= 0)
+ if (!
u->transient
&& UNIT(s)->manager->n_reloading <= 0)
return -ENOENT;
u->load_state = UNIT_LOADED;
return -ENOENT;
u->load_state = UNIT_LOADED;
@@
-151,21
+152,24
@@
static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
if (streq(key, "state")) {
SnapshotState state;
if (streq(key, "state")) {
SnapshotState state;
- if ((state = snapshot_state_from_string(value)) < 0)
+ state = snapshot_state_from_string(value);
+ if (state < 0)
log_debug("Failed to parse state value %s", value);
else
s->deserialized_state = state;
} else if (streq(key, "cleanup")) {
log_debug("Failed to parse state value %s", value);
else
s->deserialized_state = state;
} else if (streq(key, "cleanup")) {
- if ((r = parse_boolean(value)) < 0)
+ r = parse_boolean(value);
+ if (r < 0)
log_debug("Failed to parse cleanup value %s", value);
else
s->cleanup = r;
} else if (streq(key, "wants")) {
log_debug("Failed to parse cleanup value %s", value);
else
s->cleanup = r;
} else if (streq(key, "wants")) {
- if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, value, NULL, true)) < 0)
+ r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, value, NULL, true);
+ if (r < 0)
return r;
} else
log_debug("Unknown serialization key '%s'", key);
return r;
} else
log_debug("Unknown serialization key '%s'", key);
@@
-173,22
+177,22
@@
static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
return 0;
}
return 0;
}
-static UnitActiveState snapshot_active_state(Unit *u) {
+
_pure_
static UnitActiveState snapshot_active_state(Unit *u) {
assert(u);
return state_translation_table[SNAPSHOT(u)->state];
}
assert(u);
return state_translation_table[SNAPSHOT(u)->state];
}
-static const char *snapshot_sub_state_to_string(Unit *u) {
+
_pure_
static const char *snapshot_sub_state_to_string(Unit *u) {
assert(u);
return snapshot_state_to_string(SNAPSHOT(u)->state);
}
assert(u);
return snapshot_state_to_string(SNAPSHOT(u)->state);
}
-int snapshot_create(Manager *m, const char *name, bool cleanup,
DBusE
rror *e, Snapshot **_s) {
-
Iterator i
;
+int snapshot_create(Manager *m, const char *name, bool cleanup,
sd_bus_e
rror *e, Snapshot **_s) {
+
_cleanup_free_ char *n = NULL
;
Unit *other, *u = NULL;
Unit *other, *u = NULL;
-
char *n = NULL
;
+
Iterator i
;
int r;
const char *k;
int r;
const char *k;
@@
-196,20
+200,14
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
assert(_s);
if (name) {
assert(_s);
if (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_is_valid(name, false))
+ return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name);
- 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 (unit_name_to_type(name) != UNIT_SNAPSHOT)
+ return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s lacks snapshot suffix.", name);
- if (manager_get_unit(m, name)) {
- dbus_set_error(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name);
- return -EEXIST;
- }
+ if (manager_get_unit(m, name))
+ sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name);
} else {
} else {
@@
-217,28
+215,28
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
if (asprintf(&n, "snapshot-%u.snapshot", ++ m->n_snapshots) < 0)
return -ENOMEM;
if (asprintf(&n, "snapshot-%u.snapshot", ++ m->n_snapshots) < 0)
return -ENOMEM;
- if (!manager_get_unit(m, n))
+ if (!manager_get_unit(m, n)) {
+ name = n;
break;
break;
+ }
free(n);
free(n);
+ n = NULL;
}
}
-
- name = n;
}
r = manager_load_unit_prepare(m, name, NULL, e, &u);
}
r = manager_load_unit_prepare(m, name, NULL, e, &u);
- free(n);
-
if (r < 0)
goto fail;
if (r < 0)
goto fail;
-
SNAPSHOT(u)->by_snapshot_create
= true;
+
u->transient
= true;
manager_dispatch_load_queue(m);
assert(u->load_state == UNIT_LOADED);
HASHMAP_FOREACH_KEY(other, k, m->units, i) {
manager_dispatch_load_queue(m);
assert(u->load_state == UNIT_LOADED);
HASHMAP_FOREACH_KEY(other, k, m->units, i) {
- if (other->ignore_on_snapshot)
+ if (other->ignore_on_snapshot ||
+ other->transient)
continue;
if (k != other->id)
continue;
if (k != other->id)
@@
-251,12
+249,12
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
continue;
if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
continue;
- if ((r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, other, true)) < 0)
+ r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, other, true);
+ if (r < 0)
goto fail;
}
SNAPSHOT(u)->cleanup = cleanup;
goto fail;
}
SNAPSHOT(u)->cleanup = cleanup;
- u->allow_isolate = true;
*_s = SNAPSHOT(u);
return 0;
*_s = SNAPSHOT(u);
return 0;
@@
-289,8
+287,8
@@
const UnitVTable snapshot_vtable = {
.no_gc = true,
.init = snapshot_init,
.no_gc = true,
.init = snapshot_init,
-
.load = snapshot_load,
.load = snapshot_load,
+
.coldplug = snapshot_coldplug,
.dump = snapshot_dump,
.coldplug = snapshot_coldplug,
.dump = snapshot_dump,
@@
-305,5
+303,5
@@
const UnitVTable snapshot_vtable = {
.sub_state_to_string = snapshot_sub_state_to_string,
.bus_interface = "org.freedesktop.systemd1.Snapshot",
.sub_state_to_string = snapshot_sub_state_to_string,
.bus_interface = "org.freedesktop.systemd1.Snapshot",
- .bus_
message_handler = bus_snapshot_message_handler
+ .bus_
vtable = bus_snapshot_vtable
};
};