chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: systemd v38 fails to build on big-endians
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index 957af05c7eb6651b361e491ad51cf396fc5d79cd..a16d3fa0f2d06cc4c4f0e274e0a9d2e8bc638235 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-236,7
+236,7
@@
static void path_init(Unit *u) {
Path *p = PATH(u);
assert(u);
Path *p = PATH(u);
assert(u);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
p->directory_mode = 0755;
}
p->directory_mode = 0755;
}
@@
-264,8
+264,8
@@
int path_add_one_mount_link(Path *p, Mount *m) {
assert(p);
assert(m);
assert(p);
assert(m);
- if (
p->meta.
load_state != UNIT_LOADED ||
-
m->meta.
load_state != UNIT_LOADED)
+ if (
UNIT(p)->
load_state != UNIT_LOADED ||
+
UNIT(m)->
load_state != UNIT_LOADED)
return 0;
LIST_FOREACH(spec, s, p->specs) {
return 0;
LIST_FOREACH(spec, s, p->specs) {
@@
-281,13
+281,13
@@
int path_add_one_mount_link(Path *p, Mount *m) {
}
static int path_add_mount_links(Path *p) {
}
static int path_add_mount_links(Path *p) {
-
Meta
*other;
+
Unit
*other;
int r;
assert(p);
int r;
assert(p);
- LIST_FOREACH(units_by_type, other,
p->meta.
manager->units_by_type[UNIT_MOUNT])
- if ((r = path_add_one_mount_link(p,
(Mount*) other
)) < 0)
+ LIST_FOREACH(units_by_type, other,
UNIT(p)->
manager->units_by_type[UNIT_MOUNT])
+ if ((r = path_add_one_mount_link(p,
MOUNT(other)
)) < 0)
return r;
return 0;
return r;
return 0;
@@
-296,11
+296,11
@@
static int path_add_mount_links(Path *p) {
static int path_verify(Path *p) {
assert(p);
static int path_verify(Path *p) {
assert(p);
- if (
p->meta.
load_state != UNIT_LOADED)
+ if (
UNIT(p)->
load_state != UNIT_LOADED)
return 0;
if (!p->specs) {
return 0;
if (!p->specs) {
- log_error("%s lacks path setting. Refusing.",
p->meta.
id);
+ log_error("%s lacks path setting. Refusing.",
UNIT(p)->
id);
return -EINVAL;
}
return -EINVAL;
}
@@
-312,7
+312,7
@@
static int path_add_default_dependencies(Path *p) {
assert(p);
assert(p);
- if (
p->meta.
manager->running_as == MANAGER_SYSTEM) {
+ if (
UNIT(p)->
manager->running_as == MANAGER_SYSTEM) {
if ((r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
@@
-328,12
+328,12
@@
static int path_load(Unit *u) {
int r;
assert(u);
int r;
assert(u);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
if ((r = unit_load_fragment_and_dropin(u)) < 0)
return r;
if ((r = unit_load_fragment_and_dropin(u)) < 0)
return r;
- if (u->
meta.
load_state == UNIT_LOADED) {
+ if (u->load_state == UNIT_LOADED) {
if (!UNIT_DEREF(p->unit)) {
Unit *x;
if (!UNIT_DEREF(p->unit)) {
Unit *x;
@@
-352,7
+352,7
@@
static int path_load(Unit *u) {
if ((r = path_add_mount_links(p)) < 0)
return r;
if ((r = path_add_mount_links(p)) < 0)
return r;
- if (
p->meta.
default_dependencies)
+ if (
UNIT(p)->
default_dependencies)
if ((r = path_add_default_dependencies(p)) < 0)
return r;
}
if ((r = path_add_default_dependencies(p)) < 0)
return r;
}
@@
-373,7
+373,7
@@
static void path_dump(Unit *u, FILE *f, const char *prefix) {
"%sMakeDirectory: %s\n"
"%sDirectoryMode: %04o\n",
prefix, path_state_to_string(p->state),
"%sMakeDirectory: %s\n"
"%sDirectoryMode: %04o\n",
prefix, path_state_to_string(p->state),
- prefix, UNIT_DEREF(p->unit)->
meta.
id,
+ prefix, UNIT_DEREF(p->unit)->id,
prefix, yes_no(p->make_directory),
prefix, p->directory_mode);
prefix, yes_no(p->make_directory),
prefix, p->directory_mode);
@@
-416,7
+416,7
@@
static void path_set_state(Path *p, PathState state) {
if (state != old_state)
log_debug("%s changed %s -> %s",
if (state != old_state)
log_debug("%s changed %s -> %s",
-
p->meta.
id,
+
UNIT(p)->
id,
path_state_to_string(old_state),
path_state_to_string(state));
path_state_to_string(old_state),
path_state_to_string(state));
@@
-460,10
+460,10
@@
static void path_enter_running(Path *p) {
dbus_error_init(&error);
/* Don't start job if we are supposed to go down */
dbus_error_init(&error);
/* Don't start job if we are supposed to go down */
- if (
p->meta.job && p->meta.
job->type == JOB_STOP)
+ if (
UNIT(p)->job && UNIT(p)->
job->type == JOB_STOP)
return;
return;
- if ((r = manager_add_job(
p->meta.
manager, JOB_START, UNIT_DEREF(p->unit), JOB_REPLACE, true, &error, NULL)) < 0)
+ if ((r = manager_add_job(
UNIT(p)->
manager, JOB_START, UNIT_DEREF(p->unit), JOB_REPLACE, true, &error, NULL)) < 0)
goto fail;
p->inotify_triggered = false;
goto fail;
p->inotify_triggered = false;
@@
-475,7
+475,7
@@
static void path_enter_running(Path *p) {
return;
fail:
return;
fail:
- log_warning("%s failed to queue unit startup job: %s",
p->meta.
id, bus_error(&error, r));
+ log_warning("%s failed to queue unit startup job: %s",
UNIT(p)->
id, bus_error(&error, r));
path_enter_dead(p, false);
dbus_error_free(&error);
path_enter_dead(p, false);
dbus_error_free(&error);
@@
-502,7
+502,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
if (recheck)
if (path_check_good(p, initial)) {
if (recheck)
if (path_check_good(p, initial)) {
- log_debug("%s got triggered.",
p->meta.
id);
+ log_debug("%s got triggered.",
UNIT(p)->
id);
path_enter_running(p);
return;
}
path_enter_running(p);
return;
}
@@
-516,7
+516,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
if (recheck)
if (path_check_good(p, false)) {
if (recheck)
if (path_check_good(p, false)) {
- log_debug("%s got triggered.",
p->meta.
id);
+ log_debug("%s got triggered.",
UNIT(p)->
id);
path_enter_running(p);
return;
}
path_enter_running(p);
return;
}
@@
-525,7
+525,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
return;
fail:
return;
fail:
- log_warning("%s failed to enter waiting state: %s",
p->meta.
id, strerror(-r));
+ log_warning("%s failed to enter waiting state: %s",
UNIT(p)->
id, strerror(-r));
path_enter_dead(p, false);
}
path_enter_dead(p, false);
}
@@
-547,7
+547,7
@@
static int path_start(Unit *u) {
assert(p);
assert(p->state == PATH_DEAD || p->state == PATH_FAILED);
assert(p);
assert(p->state == PATH_DEAD || p->state == PATH_FAILED);
- if (UNIT_DEREF(p->unit)->
meta.
load_state != UNIT_LOADED)
+ if (UNIT_DEREF(p->unit)->load_state != UNIT_LOADED)
return -ENOENT;
path_mkdir(p);
return -ENOENT;
path_mkdir(p);
@@
-625,7
+625,7
@@
static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
p->state != PATH_RUNNING)
return;
p->state != PATH_RUNNING)
return;
- /* log_debug("inotify wakeup on %s.", u->
meta.
id); */
+ /* log_debug("inotify wakeup on %s.", u->id); */
LIST_FOREACH(spec, s, p->specs)
if (path_spec_owns_inotify_fd(s, fd))
LIST_FOREACH(spec, s, p->specs)
if (path_spec_owns_inotify_fd(s, fd))
@@
-660,22
+660,22
@@
void path_unit_notify(Unit *u, UnitActiveState new_state) {
Iterator i;
Unit *k;
Iterator i;
Unit *k;
- if (u->
meta.
type == UNIT_PATH)
+ if (u->type == UNIT_PATH)
return;
return;
- SET_FOREACH(k, u->
meta.
dependencies[UNIT_TRIGGERED_BY], i) {
+ SET_FOREACH(k, u->dependencies[UNIT_TRIGGERED_BY], i) {
Path *p;
Path *p;
- if (k->
meta.
type != UNIT_PATH)
+ if (k->type != UNIT_PATH)
continue;
continue;
- if (k->
meta.
load_state != UNIT_LOADED)
+ if (k->load_state != UNIT_LOADED)
continue;
p = PATH(k);
if (p->state == PATH_RUNNING && new_state == UNIT_INACTIVE) {
continue;
p = PATH(k);
if (p->state == PATH_RUNNING && new_state == UNIT_INACTIVE) {
- log_debug("%s got notified about unit deactivation.",
p->meta.
id);
+ log_debug("%s got notified about unit deactivation.",
UNIT(p)->
id);
/* Hmm, so inotify was triggered since the
* last activation, so I guess we need to
/* Hmm, so inotify was triggered since the
* last activation, so I guess we need to
@@
-717,6
+717,7
@@
DEFINE_STRING_TABLE_LOOKUP(path_type, PathType);
const UnitVTable path_vtable = {
.suffix = ".path",
const UnitVTable path_vtable = {
.suffix = ".path",
+ .object_size = sizeof(Path),
.sections =
"Unit\0"
"Path\0"
.sections =
"Unit\0"
"Path\0"