summaryrefslogtreecommitdiff
path: root/src/unit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/unit.c')
-rw-r--r--src/unit.c718
1 files changed, 359 insertions, 359 deletions
diff --git a/src/unit.c b/src/unit.c
index fa3c2649b3..9e33701c8f 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -61,23 +61,23 @@ Unit *unit_new(Manager *m, size_t size) {
Unit *u;
assert(m);
- assert(size >= sizeof(Meta));
+ assert(size >= sizeof(Unit));
u = malloc0(size);
if (!u)
return NULL;
- u->meta.names = set_new(string_hash_func, string_compare_func);
- if (!u->meta.names) {
+ u->names = set_new(string_hash_func, string_compare_func);
+ if (!u->names) {
free(u);
return NULL;
}
- u->meta.manager = m;
- u->meta.type = _UNIT_TYPE_INVALID;
- u->meta.deserialized_job = _JOB_TYPE_INVALID;
- u->meta.default_dependencies = true;
- u->meta.unit_file_state = _UNIT_FILE_STATE_INVALID;
+ u->manager = m;
+ u->type = _UNIT_TYPE_INVALID;
+ u->deserialized_job = _JOB_TYPE_INVALID;
+ u->default_dependencies = true;
+ u->unit_file_state = _UNIT_FILE_STATE_INVALID;
return u;
}
@@ -86,7 +86,7 @@ bool unit_has_name(Unit *u, const char *name) {
assert(u);
assert(name);
- return !!set_get(u->meta.names, (char*) name);
+ return !!set_get(u->names, (char*) name);
}
int unit_add_name(Unit *u, const char *text) {
@@ -98,10 +98,10 @@ int unit_add_name(Unit *u, const char *text) {
assert(text);
if (unit_name_is_template(text)) {
- if (!u->meta.instance)
+ if (!u->instance)
return -EINVAL;
- s = unit_name_replace_instance(text, u->meta.instance);
+ s = unit_name_replace_instance(text, u->instance);
} else
s = strdup(text);
@@ -115,7 +115,7 @@ int unit_add_name(Unit *u, const char *text) {
assert_se((t = unit_name_to_type(s)) >= 0);
- if (u->meta.type != _UNIT_TYPE_INVALID && t != u->meta.type) {
+ if (u->type != _UNIT_TYPE_INVALID && t != u->type) {
r = -EINVAL;
goto fail;
}
@@ -130,41 +130,41 @@ int unit_add_name(Unit *u, const char *text) {
/* Ensure that this unit is either instanced or not instanced,
* but not both. */
- if (u->meta.type != _UNIT_TYPE_INVALID && !u->meta.instance != !i) {
+ if (u->type != _UNIT_TYPE_INVALID && !u->instance != !i) {
r = -EINVAL;
goto fail;
}
if (unit_vtable[t]->no_alias &&
- !set_isempty(u->meta.names) &&
- !set_get(u->meta.names, s)) {
+ !set_isempty(u->names) &&
+ !set_get(u->names, s)) {
r = -EEXIST;
goto fail;
}
- if (hashmap_size(u->meta.manager->units) >= MANAGER_MAX_NAMES) {
+ if (hashmap_size(u->manager->units) >= MANAGER_MAX_NAMES) {
r = -E2BIG;
goto fail;
}
- if ((r = set_put(u->meta.names, s)) < 0) {
+ if ((r = set_put(u->names, s)) < 0) {
if (r == -EEXIST)
r = 0;
goto fail;
}
- if ((r = hashmap_put(u->meta.manager->units, s, u)) < 0) {
- set_remove(u->meta.names, s);
+ if ((r = hashmap_put(u->manager->units, s, u)) < 0) {
+ set_remove(u->names, s);
goto fail;
}
- if (u->meta.type == _UNIT_TYPE_INVALID) {
+ if (u->type == _UNIT_TYPE_INVALID) {
- u->meta.type = t;
- u->meta.id = s;
- u->meta.instance = i;
+ u->type = t;
+ u->id = s;
+ u->instance = i;
- LIST_PREPEND(Meta, units_by_type, u->meta.manager->units_by_type[t], &u->meta);
+ LIST_PREPEND(Unit, units_by_type, u->manager->units_by_type[t], u);
if (UNIT_VTABLE(u)->init)
UNIT_VTABLE(u)->init(u);
@@ -190,17 +190,17 @@ int unit_choose_id(Unit *u, const char *name) {
if (unit_name_is_template(name)) {
- if (!u->meta.instance)
+ if (!u->instance)
return -EINVAL;
- if (!(t = unit_name_replace_instance(name, u->meta.instance)))
+ if (!(t = unit_name_replace_instance(name, u->instance)))
return -ENOMEM;
name = t;
}
/* Selects one of the names of this unit as the id */
- s = set_get(u->meta.names, (char*) name);
+ s = set_get(u->names, (char*) name);
free(t);
if (!s)
@@ -209,10 +209,10 @@ int unit_choose_id(Unit *u, const char *name) {
if ((r = unit_name_to_instance(s, &i)) < 0)
return r;
- u->meta.id = s;
+ u->id = s;
- free(u->meta.instance);
- u->meta.instance = i;
+ free(u->instance);
+ u->instance = i;
unit_add_to_dbus_queue(u);
@@ -227,8 +227,8 @@ int unit_set_description(Unit *u, const char *description) {
if (!(s = strdup(description)))
return -ENOMEM;
- free(u->meta.description);
- u->meta.description = s;
+ free(u->description);
+ u->description = s;
unit_add_to_dbus_queue(u);
return 0;
@@ -237,16 +237,16 @@ int unit_set_description(Unit *u, const char *description) {
bool unit_check_gc(Unit *u) {
assert(u);
- if (u->meta.load_state == UNIT_STUB)
+ if (u->load_state == UNIT_STUB)
return true;
if (UNIT_VTABLE(u)->no_gc)
return true;
- if (u->meta.no_gc)
+ if (u->no_gc)
return true;
- if (u->meta.job)
+ if (u->job)
return true;
if (unit_active_state(u) != UNIT_INACTIVE)
@@ -261,58 +261,58 @@ bool unit_check_gc(Unit *u) {
void unit_add_to_load_queue(Unit *u) {
assert(u);
- assert(u->meta.type != _UNIT_TYPE_INVALID);
+ assert(u->type != _UNIT_TYPE_INVALID);
- if (u->meta.load_state != UNIT_STUB || u->meta.in_load_queue)
+ if (u->load_state != UNIT_STUB || u->in_load_queue)
return;
- LIST_PREPEND(Meta, load_queue, u->meta.manager->load_queue, &u->meta);
- u->meta.in_load_queue = true;
+ LIST_PREPEND(Unit, load_queue, u->manager->load_queue, u);
+ u->in_load_queue = true;
}
void unit_add_to_cleanup_queue(Unit *u) {
assert(u);
- if (u->meta.in_cleanup_queue)
+ if (u->in_cleanup_queue)
return;
- LIST_PREPEND(Meta, cleanup_queue, u->meta.manager->cleanup_queue, &u->meta);
- u->meta.in_cleanup_queue = true;
+ LIST_PREPEND(Unit, cleanup_queue, u->manager->cleanup_queue, u);
+ u->in_cleanup_queue = true;
}
void unit_add_to_gc_queue(Unit *u) {
assert(u);
- if (u->meta.in_gc_queue || u->meta.in_cleanup_queue)
+ if (u->in_gc_queue || u->in_cleanup_queue)
return;
if (unit_check_gc(u))
return;
- LIST_PREPEND(Meta, gc_queue, u->meta.manager->gc_queue, &u->meta);
- u->meta.in_gc_queue = true;
+ LIST_PREPEND(Unit, gc_queue, u->manager->gc_queue, u);
+ u->in_gc_queue = true;
- u->meta.manager->n_in_gc_queue ++;
+ u->manager->n_in_gc_queue ++;
- if (u->meta.manager->gc_queue_timestamp <= 0)
- u->meta.manager->gc_queue_timestamp = now(CLOCK_MONOTONIC);
+ if (u->manager->gc_queue_timestamp <= 0)
+ u->manager->gc_queue_timestamp = now(CLOCK_MONOTONIC);
}
void unit_add_to_dbus_queue(Unit *u) {
assert(u);
- assert(u->meta.type != _UNIT_TYPE_INVALID);
+ assert(u->type != _UNIT_TYPE_INVALID);
- if (u->meta.load_state == UNIT_STUB || u->meta.in_dbus_queue)
+ if (u->load_state == UNIT_STUB || u->in_dbus_queue)
return;
/* Shortcut things if nobody cares */
- if (!bus_has_subscriber(u->meta.manager)) {
- u->meta.sent_dbus_new_signal = true;
+ if (!bus_has_subscriber(u->manager)) {
+ u->sent_dbus_new_signal = true;
return;
}
- LIST_PREPEND(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta);
- u->meta.in_dbus_queue = true;
+ LIST_PREPEND(Unit, dbus_queue, u->manager->dbus_unit_queue, u);
+ u->in_dbus_queue = true;
}
static void bidi_set_free(Unit *u, Set *s) {
@@ -328,7 +328,7 @@ static void bidi_set_free(Unit *u, Set *s) {
UnitDependency d;
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
- set_remove(other->meta.dependencies[d], u);
+ set_remove(other->dependencies[d], u);
unit_add_to_gc_queue(other);
}
@@ -345,49 +345,49 @@ void unit_free(Unit *u) {
bus_unit_send_removed_signal(u);
- if (u->meta.load_state != UNIT_STUB)
+ if (u->load_state != UNIT_STUB)
if (UNIT_VTABLE(u)->done)
UNIT_VTABLE(u)->done(u);
- SET_FOREACH(t, u->meta.names, i)
- hashmap_remove_value(u->meta.manager->units, t, u);
+ SET_FOREACH(t, u->names, i)
+ hashmap_remove_value(u->manager->units, t, u);
- if (u->meta.job)
- job_free(u->meta.job);
+ if (u->job)
+ job_free(u->job);
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
- bidi_set_free(u, u->meta.dependencies[d]);
+ bidi_set_free(u, u->dependencies[d]);
- if (u->meta.type != _UNIT_TYPE_INVALID)
- LIST_REMOVE(Meta, units_by_type, u->meta.manager->units_by_type[u->meta.type], &u->meta);
+ if (u->type != _UNIT_TYPE_INVALID)
+ LIST_REMOVE(Unit, units_by_type, u->manager->units_by_type[u->type], u);
- if (u->meta.in_load_queue)
- LIST_REMOVE(Meta, load_queue, u->meta.manager->load_queue, &u->meta);
+ if (u->in_load_queue)
+ LIST_REMOVE(Unit, load_queue, u->manager->load_queue, u);
- if (u->meta.in_dbus_queue)
- LIST_REMOVE(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta);
+ if (u->in_dbus_queue)
+ LIST_REMOVE(Unit, dbus_queue, u->manager->dbus_unit_queue, u);
- if (u->meta.in_cleanup_queue)
- LIST_REMOVE(Meta, cleanup_queue, u->meta.manager->cleanup_queue, &u->meta);
+ if (u->in_cleanup_queue)
+ LIST_REMOVE(Unit, cleanup_queue, u->manager->cleanup_queue, u);
- if (u->meta.in_gc_queue) {
- LIST_REMOVE(Meta, gc_queue, u->meta.manager->gc_queue, &u->meta);
- u->meta.manager->n_in_gc_queue--;
+ if (u->in_gc_queue) {
+ LIST_REMOVE(Unit, gc_queue, u->manager->gc_queue, u);
+ u->manager->n_in_gc_queue--;
}
- cgroup_bonding_free_list(u->meta.cgroup_bondings, u->meta.manager->n_reloading <= 0);
- cgroup_attribute_free_list(u->meta.cgroup_attributes);
+ cgroup_bonding_free_list(u->cgroup_bondings, u->manager->n_reloading <= 0);
+ cgroup_attribute_free_list(u->cgroup_attributes);
- free(u->meta.description);
- free(u->meta.fragment_path);
- free(u->meta.instance);
+ free(u->description);
+ free(u->fragment_path);
+ free(u->instance);
- set_free_free(u->meta.names);
+ set_free_free(u->names);
- condition_free_list(u->meta.conditions);
+ condition_free_list(u->conditions);
- while (u->meta.refs)
- unit_ref_unset(u->meta.refs);
+ while (u->refs)
+ unit_ref_unset(u->refs);
free(u);
}
@@ -395,7 +395,7 @@ void unit_free(Unit *u) {
UnitActiveState unit_active_state(Unit *u) {
assert(u);
- if (u->meta.load_state == UNIT_MERGED)
+ if (u->load_state == UNIT_MERGED)
return unit_active_state(unit_follow_merge(u));
/* After a reload it might happen that a unit is not correctly
@@ -433,14 +433,14 @@ static void merge_names(Unit *u, Unit *other) {
assert(u);
assert(other);
- complete_move(&u->meta.names, &other->meta.names);
+ complete_move(&u->names, &other->names);
- set_free_free(other->meta.names);
- other->meta.names = NULL;
- other->meta.id = NULL;
+ set_free_free(other->names);
+ other->names = NULL;
+ other->id = NULL;
- SET_FOREACH(t, u->meta.names, i)
- assert_se(hashmap_replace(u->meta.manager->units, t, u) == 0);
+ SET_FOREACH(t, u->names, i)
+ assert_se(hashmap_replace(u->manager->units, t, u) == 0);
}
static void merge_dependencies(Unit *u, Unit *other, UnitDependency d) {
@@ -453,23 +453,23 @@ static void merge_dependencies(Unit *u, Unit *other, UnitDependency d) {
assert(d < _UNIT_DEPENDENCY_MAX);
/* Fix backwards pointers */
- SET_FOREACH(back, other->meta.dependencies[d], i) {
+ SET_FOREACH(back, other->dependencies[d], i) {
UnitDependency k;
for (k = 0; k < _UNIT_DEPENDENCY_MAX; k++)
- if ((r = set_remove_and_put(back->meta.dependencies[k], other, u)) < 0) {
+ if ((r = set_remove_and_put(back->dependencies[k], other, u)) < 0) {
if (r == -EEXIST)
- set_remove(back->meta.dependencies[k], other);
+ set_remove(back->dependencies[k], other);
else
assert(r == -ENOENT);
}
}
- complete_move(&u->meta.dependencies[d], &other->meta.dependencies[d]);
+ complete_move(&u->dependencies[d], &other->dependencies[d]);
- set_free(other->meta.dependencies[d]);
- other->meta.dependencies[d] = NULL;
+ set_free(other->dependencies[d]);
+ other->dependencies[d] = NULL;
}
int unit_merge(Unit *u, Unit *other) {
@@ -477,25 +477,25 @@ int unit_merge(Unit *u, Unit *other) {
assert(u);
assert(other);
- assert(u->meta.manager == other->meta.manager);
- assert(u->meta.type != _UNIT_TYPE_INVALID);
+ assert(u->manager == other->manager);
+ assert(u->type != _UNIT_TYPE_INVALID);
other = unit_follow_merge(other);
if (other == u)
return 0;
- if (u->meta.type != other->meta.type)
+ if (u->type != other->type)
return -EINVAL;
- if (!u->meta.instance != !other->meta.instance)
+ if (!u->instance != !other->instance)
return -EINVAL;
- if (other->meta.load_state != UNIT_STUB &&
- other->meta.load_state != UNIT_ERROR)
+ if (other->load_state != UNIT_STUB &&
+ other->load_state != UNIT_ERROR)
return -EEXIST;
- if (other->meta.job)
+ if (other->job)
return -EEXIST;
if (!UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other)))
@@ -505,19 +505,19 @@ int unit_merge(Unit *u, Unit *other) {
merge_names(u, other);
/* Redirect all references */
- while (other->meta.refs)
- unit_ref_set(other->meta.refs, u);
+ while (other->refs)
+ unit_ref_set(other->refs, u);
/* Merge dependencies */
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
merge_dependencies(u, other, d);
- other->meta.load_state = UNIT_MERGED;
- other->meta.merged_into = u;
+ other->load_state = UNIT_MERGED;
+ other->merged_into = u;
/* If there is still some data attached to the other node, we
* don't need it anymore, and can free it. */
- if (other->meta.load_state != UNIT_STUB)
+ if (other->load_state != UNIT_STUB)
if (UNIT_VTABLE(other)->done)
UNIT_VTABLE(other)->done(other);
@@ -536,16 +536,16 @@ int unit_merge_by_name(Unit *u, const char *name) {
assert(name);
if (unit_name_is_template(name)) {
- if (!u->meta.instance)
+ if (!u->instance)
return -EINVAL;
- if (!(s = unit_name_replace_instance(name, u->meta.instance)))
+ if (!(s = unit_name_replace_instance(name, u->instance)))
return -ENOMEM;
name = s;
}
- if (!(other = manager_get_unit(u->meta.manager, name)))
+ if (!(other = manager_get_unit(u->manager, name)))
r = unit_add_name(u, name);
else
r = unit_merge(u, other);
@@ -557,8 +557,8 @@ int unit_merge_by_name(Unit *u, const char *name) {
Unit* unit_follow_merge(Unit *u) {
assert(u);
- while (u->meta.load_state == UNIT_MERGED)
- assert_se(u = u->meta.merged_into);
+ while (u->load_state == UNIT_MERGED)
+ assert_se(u = u->merged_into);
return u;
}
@@ -586,7 +586,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
/* If syslog or kernel logging is requested, make sure our own
* logging daemon is run first. */
- if (u->meta.manager->running_as == MANAGER_SYSTEM)
+ if (u->manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, NULL, true)) < 0)
return r;
@@ -596,10 +596,10 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
const char *unit_description(Unit *u) {
assert(u);
- if (u->meta.description)
- return u->meta.description;
+ if (u->description)
+ return u->description;
- return strna(u->meta.id);
+ return strna(u->id);
}
void unit_dump(Unit *u, FILE *f, const char *prefix) {
@@ -617,7 +617,7 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
Unit *following;
assert(u);
- assert(u->meta.type >= 0);
+ assert(u->type >= 0);
if (!prefix)
prefix = "";
@@ -636,47 +636,47 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
"%s\tInactive Enter Timestamp: %s\n"
"%s\tGC Check Good: %s\n"
"%s\tNeed Daemon Reload: %s\n",
- prefix, u->meta.id,
+ prefix, u->id,
prefix, unit_description(u),
- prefix, strna(u->meta.instance),
- prefix, unit_load_state_to_string(u->meta.load_state),
+ prefix, strna(u->instance),
+ prefix, unit_load_state_to_string(u->load_state),
prefix, unit_active_state_to_string(unit_active_state(u)),
- prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->meta.inactive_exit_timestamp.realtime)),
- prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->meta.active_enter_timestamp.realtime)),
- prefix, strna(format_timestamp(timestamp3, sizeof(timestamp3), u->meta.active_exit_timestamp.realtime)),
- prefix, strna(format_timestamp(timestamp4, sizeof(timestamp4), u->meta.inactive_enter_timestamp.realtime)),
+ prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->inactive_exit_timestamp.realtime)),
+ prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->active_enter_timestamp.realtime)),
+ prefix, strna(format_timestamp(timestamp3, sizeof(timestamp3), u->active_exit_timestamp.realtime)),
+ prefix, strna(format_timestamp(timestamp4, sizeof(timestamp4), u->inactive_enter_timestamp.realtime)),
prefix, yes_no(unit_check_gc(u)),
prefix, yes_no(unit_need_daemon_reload(u)));
- SET_FOREACH(t, u->meta.names, i)
+ SET_FOREACH(t, u->names, i)
fprintf(f, "%s\tName: %s\n", prefix, t);
if ((following = unit_following(u)))
- fprintf(f, "%s\tFollowing: %s\n", prefix, following->meta.id);
+ fprintf(f, "%s\tFollowing: %s\n", prefix, following->id);
- if (u->meta.fragment_path)
- fprintf(f, "%s\tFragment Path: %s\n", prefix, u->meta.fragment_path);
+ if (u->fragment_path)
+ fprintf(f, "%s\tFragment Path: %s\n", prefix, u->fragment_path);
- if (u->meta.job_timeout > 0)
- fprintf(f, "%s\tJob Timeout: %s\n", prefix, format_timespan(timespan, sizeof(timespan), u->meta.job_timeout));
+ if (u->job_timeout > 0)
+ fprintf(f, "%s\tJob Timeout: %s\n", prefix, format_timespan(timespan, sizeof(timespan), u->job_timeout));
- condition_dump_list(u->meta.conditions, f, prefix);
+ condition_dump_list(u->conditions, f, prefix);
- if (dual_timestamp_is_set(&u->meta.condition_timestamp))
+ if (dual_timestamp_is_set(&u->condition_timestamp))
fprintf(f,
"%s\tCondition Timestamp: %s\n"
"%s\tCondition Result: %s\n",
- prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->meta.condition_timestamp.realtime)),
- prefix, yes_no(u->meta.condition_result));
+ prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->condition_timestamp.realtime)),
+ prefix, yes_no(u->condition_result));
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) {
Unit *other;
- SET_FOREACH(other, u->meta.dependencies[d], i)
- fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), other->meta.id);
+ SET_FOREACH(other, u->dependencies[d], i)
+ fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), other->id);
}
- if (u->meta.load_state == UNIT_LOADED) {
+ if (u->load_state == UNIT_LOADED) {
CGroupBonding *b;
CGroupAttribute *a;
@@ -688,19 +688,19 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
"%s\tOnFailureIsolate: %s\n"
"%s\tIgnoreOnIsolate: %s\n"
"%s\tIgnoreOnSnapshot: %s\n",
- prefix, yes_no(u->meta.stop_when_unneeded),
- prefix, yes_no(u->meta.refuse_manual_start),
- prefix, yes_no(u->meta.refuse_manual_stop),
- prefix, yes_no(u->meta.default_dependencies),
- prefix, yes_no(u->meta.on_failure_isolate),
- prefix, yes_no(u->meta.ignore_on_isolate),
- prefix, yes_no(u->meta.ignore_on_snapshot));
-
- LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings)
+ prefix, yes_no(u->stop_when_unneeded),
+ prefix, yes_no(u->refuse_manual_start),
+ prefix, yes_no(u->refuse_manual_stop),
+ prefix, yes_no(u->default_dependencies),
+ prefix, yes_no(u->on_failure_isolate),
+ prefix, yes_no(u->ignore_on_isolate),
+ prefix, yes_no(u->ignore_on_snapshot));
+
+ LIST_FOREACH(by_unit, b, u->cgroup_bondings)
fprintf(f, "%s\tControlGroup: %s:%s\n",
prefix, b->controller, b->path);
- LIST_FOREACH(by_unit, a, u->meta.cgroup_attributes) {
+ LIST_FOREACH(by_unit, a, u->cgroup_attributes) {
char *v = NULL;
if (a->map_callback)
@@ -715,16 +715,16 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
if (UNIT_VTABLE(u)->dump)
UNIT_VTABLE(u)->dump(u, f, prefix2);
- } else if (u->meta.load_state == UNIT_MERGED)
+ } else if (u->load_state == UNIT_MERGED)
fprintf(f,
"%s\tMerged into: %s\n",
- prefix, u->meta.merged_into->meta.id);
- else if (u->meta.load_state == UNIT_ERROR)
- fprintf(f, "%s\tLoad Error Code: %s\n", prefix, strerror(-u->meta.load_error));
+ prefix, u->merged_into->id);
+ else if (u->load_state == UNIT_ERROR)
+ fprintf(f, "%s\tLoad Error Code: %s\n", prefix, strerror(-u->load_error));
- if (u->meta.job)
- job_dump(u->meta.job, f, prefix2);
+ if (u->job)
+ job_dump(u->job, f, prefix2);
free(p2);
}
@@ -739,7 +739,7 @@ int unit_load_fragment_and_dropin(Unit *u) {
if ((r = unit_load_fragment(u)) < 0)
return r;
- if (u->meta.load_state == UNIT_STUB)
+ if (u->load_state == UNIT_STUB)
return -ENOENT;
/* Load drop-in directory data */
@@ -762,8 +762,8 @@ int unit_load_fragment_and_dropin_optional(Unit *u) {
if ((r = unit_load_fragment(u)) < 0)
return r;
- if (u->meta.load_state == UNIT_STUB)
- u->meta.load_state = UNIT_LOADED;
+ if (u->load_state == UNIT_STUB)
+ u->load_state = UNIT_LOADED;
/* Load drop-in directory data */
if ((r = unit_load_dropin(unit_follow_merge(u))) < 0)
@@ -776,23 +776,23 @@ int unit_add_default_target_dependency(Unit *u, Unit *target) {
assert(u);
assert(target);
- if (target->meta.type != UNIT_TARGET)
+ if (target->type != UNIT_TARGET)
return 0;
/* Only add the dependency if both units are loaded, so that
* that loop check below is reliable */
- if (u->meta.load_state != UNIT_LOADED ||
- target->meta.load_state != UNIT_LOADED)
+ if (u->load_state != UNIT_LOADED ||
+ target->load_state != UNIT_LOADED)
return 0;
/* If either side wants no automatic dependencies, then let's
* skip this */
- if (!u->meta.default_dependencies ||
- !target->meta.default_dependencies)
+ if (!u->default_dependencies ||
+ !target->default_dependencies)
return 0;
/* Don't create loops */
- if (set_get(target->meta.dependencies[UNIT_BEFORE], u))
+ if (set_get(target->dependencies[UNIT_BEFORE], u))
return 0;
return unit_add_dependency(target, UNIT_AFTER, u, true);
@@ -814,7 +814,7 @@ static int unit_add_default_dependencies(Unit *u) {
assert(u);
for (k = 0; k < ELEMENTSOF(deps); k++)
- SET_FOREACH(target, u->meta.dependencies[deps[k]], i)
+ SET_FOREACH(target, u->dependencies[deps[k]], i)
if ((r = unit_add_default_target_dependency(u, target)) < 0)
return r;
@@ -826,42 +826,42 @@ int unit_load(Unit *u) {
assert(u);
- if (u->meta.in_load_queue) {
- LIST_REMOVE(Meta, load_queue, u->meta.manager->load_queue, &u->meta);
- u->meta.in_load_queue = false;
+ if (u->in_load_queue) {
+ LIST_REMOVE(Unit, load_queue, u->manager->load_queue, u);
+ u->in_load_queue = false;
}
- if (u->meta.type == _UNIT_TYPE_INVALID)
+ if (u->type == _UNIT_TYPE_INVALID)
return -EINVAL;
- if (u->meta.load_state != UNIT_STUB)
+ if (u->load_state != UNIT_STUB)
return 0;
if (UNIT_VTABLE(u)->load)
if ((r = UNIT_VTABLE(u)->load(u)) < 0)
goto fail;
- if (u->meta.load_state == UNIT_STUB) {
+ if (u->load_state == UNIT_STUB) {
r = -ENOENT;
goto fail;
}
- if (u->meta.load_state == UNIT_LOADED &&
- u->meta.default_dependencies)
+ if (u->load_state == UNIT_LOADED &&
+ u->default_dependencies)
if ((r = unit_add_default_dependencies(u)) < 0)
goto fail;
- if (u->meta.on_failure_isolate &&
- set_size(u->meta.dependencies[UNIT_ON_FAILURE]) > 1) {
+ if (u->on_failure_isolate &&
+ set_size(u->dependencies[UNIT_ON_FAILURE]) > 1) {
log_error("More than one OnFailure= dependencies specified for %s but OnFailureIsolate= enabled. Refusing.",
- u->meta.id);
+ u->id);
r = -EINVAL;
goto fail;
}
- assert((u->meta.load_state != UNIT_MERGED) == !u->meta.merged_into);
+ assert((u->load_state != UNIT_MERGED) == !u->merged_into);
unit_add_to_dbus_queue(unit_follow_merge(u));
unit_add_to_gc_queue(u);
@@ -869,12 +869,12 @@ int unit_load(Unit *u) {
return 0;
fail:
- u->meta.load_state = UNIT_ERROR;
- u->meta.load_error = r;
+ u->load_state = UNIT_ERROR;
+ u->load_error = r;
unit_add_to_dbus_queue(u);
unit_add_to_gc_queue(u);
- log_debug("Failed to load configuration for %s: %s", u->meta.id, strerror(-r));
+ log_debug("Failed to load configuration for %s: %s", u->id, strerror(-r));
return r;
}
@@ -882,10 +882,10 @@ fail:
bool unit_condition_test(Unit *u) {
assert(u);
- dual_timestamp_get(&u->meta.condition_timestamp);
- u->meta.condition_result = condition_test_list(u->meta.conditions);
+ dual_timestamp_get(&u->condition_timestamp);
+ u->condition_result = condition_test_list(u->conditions);
- return u->meta.condition_result;
+ return u->condition_result;
}
/* Errors:
@@ -900,7 +900,7 @@ int unit_start(Unit *u) {
assert(u);
- if (u->meta.load_state != UNIT_LOADED)
+ if (u->load_state != UNIT_LOADED)
return -EINVAL;
/* If this is already started, then this will succeed. Note
@@ -917,13 +917,13 @@ int unit_start(Unit *u) {
* but we don't want to recheck the condition in that case. */
if (state != UNIT_ACTIVATING &&
!unit_condition_test(u)) {
- log_debug("Starting of %s requested but condition failed. Ignoring.", u->meta.id);
+ log_debug("Starting of %s requested but condition failed. Ignoring.", u->id);
return -EALREADY;
}
/* Forward to the main object, if we aren't it. */
if ((following = unit_following(u))) {
- log_debug("Redirecting start request from %s to %s.", u->meta.id, following->meta.id);
+ log_debug("Redirecting start request from %s to %s.", u->id, following->id);
return unit_start(following);
}
@@ -953,7 +953,7 @@ bool unit_can_isolate(Unit *u) {
assert(u);
return unit_can_start(u) &&
- u->meta.allow_isolate;
+ u->allow_isolate;
}
/* Errors:
@@ -972,7 +972,7 @@ int unit_stop(Unit *u) {
return -EALREADY;
if ((following = unit_following(u))) {
- log_debug("Redirecting stop request from %s to %s.", u->meta.id, following->meta.id);
+ log_debug("Redirecting stop request from %s to %s.", u->id, following->id);
return unit_stop(following);
}
@@ -996,7 +996,7 @@ int unit_reload(Unit *u) {
assert(u);
- if (u->meta.load_state != UNIT_LOADED)
+ if (u->load_state != UNIT_LOADED)
return -EINVAL;
if (!unit_can_reload(u))
@@ -1010,7 +1010,7 @@ int unit_reload(Unit *u) {
return -ENOEXEC;
if ((following = unit_following(u))) {
- log_debug("Redirecting reload request from %s to %s.", u->meta.id, following->meta.id);
+ log_debug("Redirecting reload request from %s to %s.", u->id, following->id);
return unit_reload(following);
}
@@ -1039,32 +1039,32 @@ static void unit_check_unneeded(Unit *u) {
/* If this service shall be shut down when unneeded then do
* so. */
- if (!u->meta.stop_when_unneeded)
+ if (!u->stop_when_unneeded)
return;
if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
return;
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY], i)
if (unit_pending_active(other))
return;
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
if (unit_pending_active(other))
return;
- SET_FOREACH(other, u->meta.dependencies[UNIT_WANTED_BY], i)
+ SET_FOREACH(other, u->dependencies[UNIT_WANTED_BY], i)
if (unit_pending_active(other))
return;
- SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i)
+ SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i)
if (unit_pending_active(other))
return;
- log_info("Service %s is not needed anymore. Stopping.", u->meta.id);
+ log_info("Service %s is not needed anymore. Stopping.", u->id);
/* Ok, nobody needs us anymore. Sniff. Then let's commit suicide */
- manager_add_job(u->meta.manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL);
+ manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL);
}
static void retroactively_start_dependencies(Unit *u) {
@@ -1074,38 +1074,38 @@ static void retroactively_start_dependencies(Unit *u) {
assert(u);
assert(UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)));
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i)
- if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i)
+ if (!set_get(u->dependencies[UNIT_AFTER], other) &&
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
+ manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
- SET_FOREACH(other, u->meta.dependencies[UNIT_BIND_TO], i)
- if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
+ SET_FOREACH(other, u->dependencies[UNIT_BIND_TO], i)
+ if (!set_get(u->dependencies[UNIT_AFTER], other) &&
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
+ manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
- if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
+ if (!set_get(u->dependencies[UNIT_AFTER], other) &&
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
+ manager_add_job(u->manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE], i)
- if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
+ SET_FOREACH(other, u->dependencies[UNIT_REQUISITE], i)
+ if (!set_get(u->dependencies[UNIT_AFTER], other) &&
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
+ manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
- SET_FOREACH(other, u->meta.dependencies[UNIT_WANTS], i)
- if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
+ SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
+ if (!set_get(u->dependencies[UNIT_AFTER], other) &&
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
+ manager_add_job(u->manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
- SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTS], i)
+ SET_FOREACH(other, u->dependencies[UNIT_CONFLICTS], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
+ manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
- SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTED_BY], i)
+ SET_FOREACH(other, u->dependencies[UNIT_CONFLICTED_BY], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
+ manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
}
static void retroactively_stop_dependencies(Unit *u) {
@@ -1116,9 +1116,9 @@ static void retroactively_stop_dependencies(Unit *u) {
assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)));
/* Pull down units which are bound to us recursively if enabled */
- SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i)
+ SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
- manager_add_job(u->meta.manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
+ manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
}
static void check_unneeded_dependencies(Unit *u) {
@@ -1129,22 +1129,22 @@ static void check_unneeded_dependencies(Unit *u) {
assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)));
/* Garbage collect services that might not be needed anymore, if enabled */
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i)
+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
unit_check_unneeded(other);
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
+ SET_FOREACH(other, u->dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
unit_check_unneeded(other);
- SET_FOREACH(other, u->meta.dependencies[UNIT_WANTS], i)
+ SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
unit_check_unneeded(other);
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE], i)
+ SET_FOREACH(other, u->dependencies[UNIT_REQUISITE], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
unit_check_unneeded(other);
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE_OVERRIDABLE], i)
+ SET_FOREACH(other, u->dependencies[UNIT_REQUISITE_OVERRIDABLE], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
unit_check_unneeded(other);
- SET_FOREACH(other, u->meta.dependencies[UNIT_BIND_TO], i)
+ SET_FOREACH(other, u->dependencies[UNIT_BIND_TO], i)
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
unit_check_unneeded(other);
}
@@ -1155,15 +1155,15 @@ void unit_trigger_on_failure(Unit *u) {
assert(u);
- if (set_size(u->meta.dependencies[UNIT_ON_FAILURE]) <= 0)
+ if (set_size(u->dependencies[UNIT_ON_FAILURE]) <= 0)
return;
- log_info("Triggering OnFailure= dependencies of %s.", u->meta.id);
+ log_info("Triggering OnFailure= dependencies of %s.", u->id);
- SET_FOREACH(other, u->meta.dependencies[UNIT_ON_FAILURE], i) {
+ SET_FOREACH(other, u->dependencies[UNIT_ON_FAILURE], i) {
int r;
- if ((r = manager_add_job(u->meta.manager, JOB_START, other, u->meta.on_failure_isolate ? JOB_ISOLATE : JOB_REPLACE, true, NULL, NULL)) < 0)
+ if ((r = manager_add_job(u->manager, JOB_START, other, u->on_failure_isolate ? JOB_ISOLATE : JOB_REPLACE, true, NULL, NULL)) < 0)
log_error("Failed to enqueue OnFailure= job: %s", strerror(-r));
}
}
@@ -1181,54 +1181,54 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
* behaviour here. For example: if a mount point is remounted
* this function will be called too! */
- if (u->meta.manager->n_reloading <= 0) {
+ if (u->manager->n_reloading <= 0) {
dual_timestamp ts;
dual_timestamp_get(&ts);
if (UNIT_IS_INACTIVE_OR_FAILED(os) && !UNIT_IS_INACTIVE_OR_FAILED(ns))
- u->meta.inactive_exit_timestamp = ts;
+ u->inactive_exit_timestamp = ts;
else if (!UNIT_IS_INACTIVE_OR_FAILED(os) && UNIT_IS_INACTIVE_OR_FAILED(ns))
- u->meta.inactive_enter_timestamp = ts;
+ u->inactive_enter_timestamp = ts;
if (!UNIT_IS_ACTIVE_OR_RELOADING(os) && UNIT_IS_ACTIVE_OR_RELOADING(ns))
- u->meta.active_enter_timestamp = ts;
+ u->active_enter_timestamp = ts;
else if (UNIT_IS_ACTIVE_OR_RELOADING(os) && !UNIT_IS_ACTIVE_OR_RELOADING(ns))
- u->meta.active_exit_timestamp = ts;
+ u->active_exit_timestamp = ts;
timer_unit_notify(u, ns);
path_unit_notify(u, ns);
}
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
- cgroup_bonding_trim_list(u->meta.cgroup_bondings, true);
+ cgroup_bonding_trim_list(u->cgroup_bondings, true);
- if (u->meta.job) {
+ if (u->job) {
unexpected = false;
- if (u->meta.job->state == JOB_WAITING)
+ if (u->job->state == JOB_WAITING)
/* So we reached a different state for this
* job. Let's see if we can run it now if it
* failed previously due to EAGAIN. */
- job_add_to_run_queue(u->meta.job);
+ job_add_to_run_queue(u->job);
/* Let's check whether this state change constitutes a
* finished job, or maybe contradicts a running job and
* hence needs to invalidate jobs. */
- switch (u->meta.job->type) {
+ switch (u->job->type) {
case JOB_START:
case JOB_VERIFY_ACTIVE:
if (UNIT_IS_ACTIVE_OR_RELOADING(ns))
- job_finish_and_invalidate(u->meta.job, JOB_DONE);
- else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) {
+ job_finish_and_invalidate(u->job, JOB_DONE);
+ else if (u->job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) {
unexpected = true;
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
- job_finish_and_invalidate(u->meta.job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
+ job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
}
break;
@@ -1236,14 +1236,14 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
case JOB_RELOAD:
case JOB_RELOAD_OR_START:
- if (u->meta.job->state == JOB_RUNNING) {
+ if (u->job->state == JOB_RUNNING) {
if (ns == UNIT_ACTIVE)
- job_finish_and_invalidate(u->meta.job, reload_success ? JOB_DONE : JOB_FAILED);
+ job_finish_and_invalidate(u->job, reload_success ? JOB_DONE : JOB_FAILED);
else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) {
unexpected = true;
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
- job_finish_and_invalidate(u->meta.job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
+ job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
}
}
@@ -1254,10 +1254,10 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
case JOB_TRY_RESTART:
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
- job_finish_and_invalidate(u->meta.job, JOB_DONE);
- else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
+ job_finish_and_invalidate(u->job, JOB_DONE);
+ else if (u->job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
unexpected = true;
- job_finish_and_invalidate(u->meta.job, JOB_FAILED);
+ job_finish_and_invalidate(u->job, JOB_FAILED);
}
break;
@@ -1269,7 +1269,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
} else
unexpected = true;
- if (u->meta.manager->n_reloading <= 0) {
+ if (u->manager->n_reloading <= 0) {
/* If this state change happened without being
* requested by a job, then let's retroactively start
@@ -1290,7 +1290,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
check_unneeded_dependencies(u);
if (ns != os && ns == UNIT_FAILED) {
- log_notice("Unit %s entered failed state.", u->meta.id);
+ log_notice("Unit %s entered failed state.", u->id);
unit_trigger_on_failure(u);
}
}
@@ -1302,46 +1302,46 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
/* The bus just might have become available,
* hence try to connect to it, if we aren't
* yet connected. */
- bus_init(u->meta.manager, true);
+ bus_init(u->manager, true);
- if (u->meta.type == UNIT_SERVICE &&
+ if (u->type == UNIT_SERVICE &&
!UNIT_IS_ACTIVE_OR_RELOADING(os) &&
- u->meta.manager->n_reloading <= 0) {
+ u->manager->n_reloading <= 0) {
/* Write audit record if we have just finished starting up */
- manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, true);
- u->meta.in_audit = true;
+ manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_START, true);
+ u->in_audit = true;
}
if (!UNIT_IS_ACTIVE_OR_RELOADING(os))
- manager_send_unit_plymouth(u->meta.manager, u);
+ manager_send_unit_plymouth(u->manager, u);
} else {
/* We don't care about D-Bus here, since we'll get an
* asynchronous notification for it anyway. */
- if (u->meta.type == UNIT_SERVICE &&
+ if (u->type == UNIT_SERVICE &&
UNIT_IS_INACTIVE_OR_FAILED(ns) &&
!UNIT_IS_INACTIVE_OR_FAILED(os) &&
- u->meta.manager->n_reloading <= 0) {
+ u->manager->n_reloading <= 0) {
/* Hmm, if there was no start record written
* write it now, so that we always have a nice
* pair */
- if (!u->meta.in_audit) {
- manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE);
+ if (!u->in_audit) {
+ manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE);
if (ns == UNIT_INACTIVE)
- manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, true);
+ manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_STOP, true);
} else
/* Write audit record if we have just finished shutting down */
- manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE);
+ manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE);
- u->meta.in_audit = false;
+ u->in_audit = false;
}
}
- manager_recheck_journal(u->meta.manager);
+ manager_recheck_journal(u->manager);
/* Maybe we finished startup and are now ready for being
* stopped because unneeded? */
@@ -1363,7 +1363,7 @@ int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) {
ev.data.ptr = w;
ev.events = events;
- if (epoll_ctl(u->meta.manager->epoll_fd,
+ if (epoll_ctl(u->manager->epoll_fd,
w->type == WATCH_INVALID ? EPOLL_CTL_ADD : EPOLL_CTL_MOD,
fd,
&ev) < 0)
@@ -1385,7 +1385,7 @@ void unit_unwatch_fd(Unit *u, Watch *w) {
assert(w->type == WATCH_FD);
assert(w->data.unit == u);
- assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
+ assert_se(epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
w->fd = -1;
w->type = WATCH_INVALID;
@@ -1399,14 +1399,14 @@ int unit_watch_pid(Unit *u, pid_t pid) {
/* Watch a specific PID. We only support one unit watching
* each PID for now. */
- return hashmap_put(u->meta.manager->watch_pids, LONG_TO_PTR(pid), u);
+ return hashmap_put(u->manager->watch_pids, LONG_TO_PTR(pid), u);
}
void unit_unwatch_pid(Unit *u, pid_t pid) {
assert(u);
assert(pid >= 1);
- hashmap_remove_value(u->meta.manager->watch_pids, LONG_TO_PTR(pid), u);
+ hashmap_remove_value(u->manager->watch_pids, LONG_TO_PTR(pid), u);
}
int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
@@ -1459,7 +1459,7 @@ int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
ev.data.ptr = w;
ev.events = EPOLLIN;
- if (epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0)
+ if (epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0)
goto fail;
}
@@ -1487,7 +1487,7 @@ void unit_unwatch_timer(Unit *u, Watch *w) {
assert(w->data.unit == u);
assert(w->fd >= 0);
- assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
+ assert_se(epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
close_nointr_nofail(w->fd);
w->fd = -1;
@@ -1560,34 +1560,34 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen
if (u == other)
return 0;
- if ((r = set_ensure_allocated(&u->meta.dependencies[d], trivial_hash_func, trivial_compare_func)) < 0)
+ if ((r = set_ensure_allocated(&u->dependencies[d], trivial_hash_func, trivial_compare_func)) < 0)
return r;
if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID)
- if ((r = set_ensure_allocated(&other->meta.dependencies[inverse_table[d]], trivial_hash_func, trivial_compare_func)) < 0)
+ if ((r = set_ensure_allocated(&other->dependencies[inverse_table[d]], trivial_hash_func, trivial_compare_func)) < 0)
return r;
if (add_reference)
- if ((r = set_ensure_allocated(&u->meta.dependencies[UNIT_REFERENCES], trivial_hash_func, trivial_compare_func)) < 0 ||
- (r = set_ensure_allocated(&other->meta.dependencies[UNIT_REFERENCED_BY], trivial_hash_func, trivial_compare_func)) < 0)
+ if ((r = set_ensure_allocated(&u->dependencies[UNIT_REFERENCES], trivial_hash_func, trivial_compare_func)) < 0 ||
+ (r = set_ensure_allocated(&other->dependencies[UNIT_REFERENCED_BY], trivial_hash_func, trivial_compare_func)) < 0)
return r;
- if ((q = set_put(u->meta.dependencies[d], other)) < 0)
+ if ((q = set_put(u->dependencies[d], other)) < 0)
return q;
if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID)
- if ((v = set_put(other->meta.dependencies[inverse_table[d]], u)) < 0) {
+ if ((v = set_put(other->dependencies[inverse_table[d]], u)) < 0) {
r = v;
goto fail;
}
if (add_reference) {
- if ((w = set_put(u->meta.dependencies[UNIT_REFERENCES], other)) < 0) {
+ if ((w = set_put(u->dependencies[UNIT_REFERENCES], other)) < 0) {
r = w;
goto fail;
}
- if ((r = set_put(other->meta.dependencies[UNIT_REFERENCED_BY], u)) < 0)
+ if ((r = set_put(other->dependencies[UNIT_REFERENCED_BY], u)) < 0)
goto fail;
}
@@ -1596,13 +1596,13 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen
fail:
if (q > 0)
- set_remove(u->meta.dependencies[d], other);
+ set_remove(u->dependencies[d], other);
if (v > 0)
- set_remove(other->meta.dependencies[inverse_table[d]], u);
+ set_remove(other->dependencies[inverse_table[d]], u);
if (w > 0)
- set_remove(u->meta.dependencies[UNIT_REFERENCES], other);
+ set_remove(u->dependencies[UNIT_REFERENCES], other);
return r;
}
@@ -1635,12 +1635,12 @@ static const char *resolve_template(Unit *u, const char *name, const char*path,
return name;
}
- if (u->meta.instance)
- s = unit_name_replace_instance(name, u->meta.instance);
+ if (u->instance)
+ s = unit_name_replace_instance(name, u->instance);
else {
char *i;
- if (!(i = unit_name_to_prefix(u->meta.id)))
+ if (!(i = unit_name_to_prefix(u->id)))
return NULL;
s = unit_name_replace_instance(name, i);
@@ -1665,7 +1665,7 @@ int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, con
if (!(name = resolve_template(u, name, path, &s)))
return -ENOMEM;
- if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
+ if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
goto finish;
r = unit_add_dependency(u, d, other, add_reference);
@@ -1686,7 +1686,7 @@ int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency
if (!(name = resolve_template(u, name, path, &s)))
return -ENOMEM;
- if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
+ if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
goto finish;
r = unit_add_two_dependencies(u, d, e, other, add_reference);
@@ -1707,7 +1707,7 @@ int unit_add_dependency_by_name_inverse(Unit *u, UnitDependency d, const char *n
if (!(name = resolve_template(u, name, path, &s)))
return -ENOMEM;
- if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
+ if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
goto finish;
r = unit_add_dependency(other, d, u, add_reference);
@@ -1728,7 +1728,7 @@ int unit_add_two_dependencies_by_name_inverse(Unit *u, UnitDependency d, UnitDep
if (!(name = resolve_template(u, name, path, &s)))
return -ENOMEM;
- if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
+ if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
goto finish;
if ((r = unit_add_two_dependencies(other, d, e, u, add_reference)) < 0)
@@ -1773,10 +1773,10 @@ char *unit_dbus_path(Unit *u) {
assert(u);
- if (!u->meta.id)
+ if (!u->id)
return NULL;
- if (!(e = bus_path_escape(u->meta.id)))
+ if (!(e = bus_path_escape(u->id)))
return NULL;
p = strappend("/org/freedesktop/systemd1/unit/", e);
@@ -1806,16 +1806,16 @@ int unit_add_cgroup(Unit *u, CGroupBonding *b) {
if (streq(b->controller, SYSTEMD_CGROUP_CONTROLLER)) {
CGroupBonding *l;
- l = hashmap_get(u->meta.manager->cgroup_bondings, b->path);
+ l = hashmap_get(u->manager->cgroup_bondings, b->path);
LIST_PREPEND(CGroupBonding, by_path, l, b);
- if ((r = hashmap_replace(u->meta.manager->cgroup_bondings, b->path, l)) < 0) {
+ if ((r = hashmap_replace(u->manager->cgroup_bondings, b->path, l)) < 0) {
LIST_REMOVE(CGroupBonding, by_path, l, b);
return r;
}
}
- LIST_PREPEND(CGroupBonding, by_unit, u->meta.cgroup_bondings, b);
+ LIST_PREPEND(CGroupBonding, by_unit, u->cgroup_bondings, b);
b->unit = u;
return 0;
@@ -1826,17 +1826,17 @@ static char *default_cgroup_path(Unit *u) {
assert(u);
- if (u->meta.instance) {
+ if (u->instance) {
char *t;
- t = unit_name_template(u->meta.id);
+ t = unit_name_template(u->id);
if (!t)
return NULL;
- p = join(u->meta.manager->cgroup_hierarchy, "/", t, "/", u->meta.instance, NULL);
+ p = join(u->manager->cgroup_hierarchy, "/", t, "/", u->instance, NULL);
free(t);
} else
- p = join(u->meta.manager->cgroup_hierarchy, "/", u->meta.id, NULL);
+ p = join(u->manager->cgroup_hierarchy, "/", u->id, NULL);
return p;
}
@@ -1870,7 +1870,7 @@ int unit_add_cgroup_from_text(Unit *u, const char *name) {
return -ENOMEM;
}
- if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller)) {
+ if (cgroup_bonding_find_list(u->cgroup_bondings, controller)) {
r = -EEXIST;
goto fail;
}
@@ -1907,7 +1907,7 @@ static int unit_add_one_default_cgroup(Unit *u, const char *controller) {
if (!controller)
controller = SYSTEMD_CGROUP_CONTROLLER;
- if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller))
+ if (cgroup_bonding_find_list(u->cgroup_bondings, controller))
return 0;
if (!(b = new0(CGroupBonding, 1)))
@@ -1945,16 +1945,16 @@ int unit_add_default_cgroups(Unit *u) {
/* Adds in the default cgroups, if they weren't specified
* otherwise. */
- if (!u->meta.manager->cgroup_hierarchy)
+ if (!u->manager->cgroup_hierarchy)
return 0;
if ((r = unit_add_one_default_cgroup(u, NULL)) < 0)
return r;
- STRV_FOREACH(c, u->meta.manager->default_controllers)
+ STRV_FOREACH(c, u->manager->default_controllers)
unit_add_one_default_cgroup(u, *c);
- LIST_FOREACH(by_unit, a, u->meta.cgroup_attributes)
+ LIST_FOREACH(by_unit, a, u->cgroup_attributes)
unit_add_one_default_cgroup(u, a->controller);
return 0;
@@ -1963,7 +1963,7 @@ int unit_add_default_cgroups(Unit *u) {
CGroupBonding* unit_get_default_cgroup(Unit *u) {
assert(u);
- return cgroup_bonding_find_list(u->meta.cgroup_bondings, SYSTEMD_CGROUP_CONTROLLER);
+ return cgroup_bonding_find_list(u->cgroup_bondings, SYSTEMD_CGROUP_CONTROLLER);
}
int unit_add_cgroup_attribute(Unit *u, const char *controller, const char *name, const char *value, CGroupAttributeMapCallback map_callback) {
@@ -2020,7 +2020,7 @@ int unit_add_cgroup_attribute(Unit *u, const char *controller, const char *name,
a->map_callback = map_callback;
- LIST_PREPEND(CGroupAttribute, by_unit, u->meta.cgroup_attributes, a);
+ LIST_PREPEND(CGroupAttribute, by_unit, u->cgroup_attributes, a);
r = 0;
@@ -2037,12 +2037,12 @@ int unit_load_related_unit(Unit *u, const char *type, Unit **_found) {
assert(type);
assert(_found);
- if (!(t = unit_name_change_suffix(u->meta.id, type)))
+ if (!(t = unit_name_change_suffix(u->id, type)))
return -ENOMEM;
assert(!unit_has_name(u, t));
- r = manager_load_unit(u->meta.manager, t, NULL, NULL, _found);
+ r = manager_load_unit(u->manager, t, NULL, NULL, _found);
free(t);
assert(r < 0 || *_found != u);
@@ -2058,12 +2058,12 @@ int unit_get_related_unit(Unit *u, const char *type, Unit **_found) {
assert(type);
assert(_found);
- if (!(t = unit_name_change_suffix(u->meta.id, type)))
+ if (!(t = unit_name_change_suffix(u->id, type)))
return -ENOMEM;
assert(!unit_has_name(u, t));
- found = manager_get_unit(u->meta.manager, t);
+ found = manager_get_unit(u->manager, t);
free(t);
if (!found)
@@ -2077,14 +2077,14 @@ static char *specifier_prefix_and_instance(char specifier, void *data, void *use
Unit *u = userdata;
assert(u);
- return unit_name_to_prefix_and_instance(u->meta.id);
+ return unit_name_to_prefix_and_instance(u->id);
}
static char *specifier_prefix(char specifier, void *data, void *userdata) {
Unit *u = userdata;
assert(u);
- return unit_name_to_prefix(u->meta.id);
+ return unit_name_to_prefix(u->id);
}
static char *specifier_prefix_unescaped(char specifier, void *data, void *userdata) {
@@ -2093,7 +2093,7 @@ static char *specifier_prefix_unescaped(char specifier, void *data, void *userda
assert(u);
- if (!(p = unit_name_to_prefix(u->meta.id)))
+ if (!(p = unit_name_to_prefix(u->id)))
return NULL;
r = unit_name_unescape(p);
@@ -2106,8 +2106,8 @@ static char *specifier_instance_unescaped(char specifier, void *data, void *user
Unit *u = userdata;
assert(u);
- if (u->meta.instance)
- return unit_name_unescape(u->meta.instance);
+ if (u->instance)
+ return unit_name_unescape(u->instance);
return strdup("");
}
@@ -2116,10 +2116,10 @@ static char *specifier_filename(char specifier, void *data, void *userdata) {
Unit *u = userdata;
assert(u);
- if (u->meta.instance)
- return unit_name_path_unescape(u->meta.instance);
+ if (u->instance)
+ return unit_name_path_unescape(u->instance);
- return unit_name_to_path(u->meta.instance);
+ return unit_name_to_path(u->instance);
}
static char *specifier_cgroup(char specifier, void *data, void *userdata) {
@@ -2135,9 +2135,9 @@ static char *specifier_cgroup_root(char specifier, void *data, void *userdata) {
assert(u);
if (specifier == 'r')
- return strdup(u->meta.manager->cgroup_hierarchy);
+ return strdup(u->manager->cgroup_hierarchy);
- if (parent_of_path(u->meta.manager->cgroup_hierarchy, &p) < 0)
+ if (parent_of_path(u->manager->cgroup_hierarchy, &p) < 0)
return strdup("");
if (streq(p, "/")) {
@@ -2152,7 +2152,7 @@ static char *specifier_runtime(char specifier, void *data, void *userdata) {
Unit *u = userdata;
assert(u);
- if (u->meta.manager->running_as == MANAGER_USER) {
+ if (u->manager->running_as == MANAGER_USER) {
const char *e;
e = getenv("XDG_RUNTIME_DIR");
@@ -2176,10 +2176,10 @@ char *unit_name_printf(Unit *u, const char* format) {
*/
const Specifier table[] = {
- { 'n', specifier_string, u->meta.id },
+ { 'n', specifier_string, u->id },
{ 'N', specifier_prefix_and_instance, NULL },
{ 'p', specifier_prefix, NULL },
- { 'i', specifier_string, u->meta.instance },
+ { 'i', specifier_string, u->instance },
{ 0, NULL, NULL }
};
@@ -2201,11 +2201,11 @@ char *unit_full_printf(Unit *u, const char *format) {
*/
const Specifier table[] = {
- { 'n', specifier_string, u->meta.id },
+ { 'n', specifier_string, u->id },
{ 'N', specifier_prefix_and_instance, NULL },
{ 'p', specifier_prefix, NULL },
{ 'P', specifier_prefix_unescaped, NULL },
- { 'i', specifier_string, u->meta.instance },
+ { 'i', specifier_string, u->instance },
{ 'I', specifier_instance_unescaped, NULL },
{ 'f', specifier_filename, NULL },
{ 'c', specifier_cgroup, NULL },
@@ -2256,14 +2256,14 @@ int unit_watch_bus_name(Unit *u, const char *name) {
/* Watch a specific name on the bus. We only support one unit
* watching each name for now. */
- return hashmap_put(u->meta.manager->watch_bus, name, u);
+ return hashmap_put(u->manager->watch_bus, name, u);
}
void unit_unwatch_bus_name(Unit *u, const char *name) {
assert(u);
assert(name);
- hashmap_remove_value(u->meta.manager->watch_bus, name, u);
+ hashmap_remove_value(u->manager->watch_bus, name, u);
}
bool unit_can_serialize(Unit *u) {
@@ -2285,17 +2285,17 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds) {
if ((r = UNIT_VTABLE(u)->serialize(u, f, fds)) < 0)
return r;
- if (u->meta.job)
- unit_serialize_item(u, f, "job", job_type_to_string(u->meta.job->type));
+ if (u->job)
+ unit_serialize_item(u, f, "job", job_type_to_string(u->job->type));
- dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->meta.inactive_exit_timestamp);
- dual_timestamp_serialize(f, "active-enter-timestamp", &u->meta.active_enter_timestamp);
- dual_timestamp_serialize(f, "active-exit-timestamp", &u->meta.active_exit_timestamp);
- dual_timestamp_serialize(f, "inactive-enter-timestamp", &u->meta.inactive_enter_timestamp);
- dual_timestamp_serialize(f, "condition-timestamp", &u->meta.condition_timestamp);
+ dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->inactive_exit_timestamp);
+ dual_timestamp_serialize(f, "active-enter-timestamp", &u->active_enter_timestamp);
+ dual_timestamp_serialize(f, "active-exit-timestamp", &u->active_exit_timestamp);
+ dual_timestamp_serialize(f, "inactive-enter-timestamp", &u->inactive_enter_timestamp);
+ dual_timestamp_serialize(f, "condition-timestamp", &u->condition_timestamp);
- if (dual_timestamp_is_set(&u->meta.condition_timestamp))
- unit_serialize_item(u, f, "condition-result", yes_no(u->meta.condition_result));
+ if (dual_timestamp_is_set(&u->condition_timestamp))
+ unit_serialize_item(u, f, "condition-result", yes_no(u->condition_result));
/* End marker */
fputc('\n', f);
@@ -2370,23 +2370,23 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
if ((type = job_type_from_string(v)) < 0)
log_debug("Failed to parse job type value %s", v);
else
- u->meta.deserialized_job = type;
+ u->deserialized_job = type;
continue;
} else if (streq(l, "inactive-exit-timestamp")) {
- dual_timestamp_deserialize(v, &u->meta.inactive_exit_timestamp);
+ dual_timestamp_deserialize(v, &u->inactive_exit_timestamp);
continue;
} else if (streq(l, "active-enter-timestamp")) {
- dual_timestamp_deserialize(v, &u->meta.active_enter_timestamp);
+ dual_timestamp_deserialize(v, &u->active_enter_timestamp);
continue;
} else if (streq(l, "active-exit-timestamp")) {
- dual_timestamp_deserialize(v, &u->meta.active_exit_timestamp);
+ dual_timestamp_deserialize(v, &u->active_exit_timestamp);
continue;
} else if (streq(l, "inactive-enter-timestamp")) {
- dual_timestamp_deserialize(v, &u->meta.inactive_enter_timestamp);
+ dual_timestamp_deserialize(v, &u->inactive_enter_timestamp);
continue;
} else if (streq(l, "condition-timestamp")) {
- dual_timestamp_deserialize(v, &u->meta.condition_timestamp);
+ dual_timestamp_deserialize(v, &u->condition_timestamp);
continue;
} else if (streq(l, "condition-result")) {
int b;
@@ -2394,7 +2394,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
if ((b = parse_boolean(v)) < 0)
log_debug("Failed to parse condition result value %s", v);
else
- u->meta.condition_result = b;
+ u->condition_result = b;
continue;
}
@@ -2422,7 +2422,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
if (!(e = unit_name_build_escape(what+1, NULL, ".device")))
return -ENOMEM;
- r = manager_load_unit(u->meta.manager, e, NULL, NULL, &device);
+ r = manager_load_unit(u->manager, e, NULL, NULL, &device);
free(e);
if (r < 0)
@@ -2447,11 +2447,11 @@ int unit_coldplug(Unit *u) {
if ((r = UNIT_VTABLE(u)->coldplug(u)) < 0)
return r;
- if (u->meta.deserialized_job >= 0) {
- if ((r = manager_add_job(u->meta.manager, u->meta.deserialized_job, u, JOB_IGNORE_REQUIREMENTS, false, NULL, NULL)) < 0)
+ if (u->deserialized_job >= 0) {
+ if ((r = manager_add_job(u->manager, u->deserialized_job, u, JOB_IGNORE_REQUIREMENTS, false, NULL, NULL)) < 0)
return r;
- u->meta.deserialized_job = _JOB_TYPE_INVALID;
+ u->deserialized_job = _JOB_TYPE_INVALID;
}
return 0;
@@ -2466,10 +2466,10 @@ void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
if (!UNIT_VTABLE(u)->show_status)
return;
- if (!manager_get_show_status(u->meta.manager))
+ if (!manager_get_show_status(u->manager))
return;
- if (!manager_is_booting_or_shutting_down(u->meta.manager))
+ if (!manager_is_booting_or_shutting_down(u->manager))
return;
va_start(ap, format);
@@ -2480,16 +2480,16 @@ void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
bool unit_need_daemon_reload(Unit *u) {
assert(u);
- if (u->meta.fragment_path) {
+ if (u->fragment_path) {
struct stat st;
zero(st);
- if (stat(u->meta.fragment_path, &st) < 0)
+ if (stat(u->fragment_path, &st) < 0)
/* What, cannot access this anymore? */
return true;
- if (u->meta.fragment_mtime > 0 &&
- timespec_load(&st.st_mtim) != u->meta.fragment_mtime)
+ if (u->fragment_mtime > 0 &&
+ timespec_load(&st.st_mtim) != u->fragment_mtime)
return true;
}
@@ -2523,7 +2523,7 @@ bool unit_pending_inactive(Unit *u) {
if (UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)))
return true;
- if (u->meta.job && u->meta.job->type == JOB_STOP)
+ if (u->job && u->job->type == JOB_STOP)
return true;
return false;
@@ -2537,10 +2537,10 @@ bool unit_pending_active(Unit *u) {
if (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
return true;
- if (u->meta.job &&
- (u->meta.job->type == JOB_START ||
- u->meta.job->type == JOB_RELOAD_OR_START ||
- u->meta.job->type == JOB_RESTART))
+ if (u->job &&
+ (u->job->type == JOB_START ||
+ u->job->type == JOB_RELOAD_OR_START ||
+ u->job->type == JOB_RESTART))
return true;
return false;
@@ -2598,12 +2598,12 @@ int unit_following_set(Unit *u, Set **s) {
UnitFileState unit_get_unit_file_state(Unit *u) {
assert(u);
- if (u->meta.unit_file_state < 0 && u->meta.fragment_path)
- u->meta.unit_file_state = unit_file_get_state(
- u->meta.manager->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER,
- NULL, file_name_from_path(u->meta.fragment_path));
+ if (u->unit_file_state < 0 && u->fragment_path)
+ u->unit_file_state = unit_file_get_state(
+ u->manager->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER,
+ NULL, file_name_from_path(u->fragment_path));
- return u->meta.unit_file_state;
+ return u->unit_file_state;
}
Unit* unit_ref_set(UnitRef *ref, Unit *u) {
@@ -2614,7 +2614,7 @@ Unit* unit_ref_set(UnitRef *ref, Unit *u) {
unit_ref_unset(ref);
ref->unit = u;
- LIST_PREPEND(UnitRef, refs, u->meta.refs, ref);
+ LIST_PREPEND(UnitRef, refs, u->refs, ref);
return u;
}
@@ -2624,7 +2624,7 @@ void unit_ref_unset(UnitRef *ref) {
if (!ref->unit)
return;
- LIST_REMOVE(UnitRef, refs, ref->unit->meta.refs, ref);
+ LIST_REMOVE(UnitRef, refs, ref->unit->refs, ref);
ref->unit = NULL;
}