chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3fc546f
)
path: after installing inotify watches, recheck file again to fix race
author
Lennart Poettering
<lennart@poettering.net>
Fri, 4 Mar 2011 00:49:37 +0000
(
01:49
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 4 Mar 2011 00:50:38 +0000
(
01:50
+0100)
src/path.c
patch
|
blob
|
history
diff --git
a/src/path.c
b/src/path.c
index 1455b47995e4943f2bf3affb10d8b558e2fa3951..f7878b56ae0cb9ca55d2f844219f8a9cce447847 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-282,7
+282,7
@@
static void path_set_state(Path *p, PathState state) {
unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state], true);
}
unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state], true);
}
-static void path_enter_waiting(Path *p, bool initial, bool recheck);
+static void path_enter_waiting(Path *p, bool initial, bool recheck
, bool skip_watch
);
static int path_coldplug(Unit *u) {
Path *p = PATH(u);
static int path_coldplug(Unit *u) {
Path *p = PATH(u);
@@
-294,7
+294,7
@@
static int path_coldplug(Unit *u) {
if (p->deserialized_state == PATH_WAITING ||
p->deserialized_state == PATH_RUNNING)
if (p->deserialized_state == PATH_WAITING ||
p->deserialized_state == PATH_RUNNING)
- path_enter_waiting(p, true, true);
+ path_enter_waiting(p, true, true
, false
);
else
path_set_state(p, p->deserialized_state);
}
else
path_set_state(p, p->deserialized_state);
}
@@
-341,7
+341,7
@@
fail:
}
}
-static void path_enter_waiting(Path *p, bool initial, bool recheck) {
+static void path_enter_waiting(Path *p, bool initial, bool recheck
, bool skip_watch
) {
PathSpec *s;
int r;
bool good = false;
PathSpec *s;
int r;
bool good = false;
@@
-389,8
+389,16
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
}
waiting:
}
waiting:
- if ((r = path_watch(p)) < 0)
- goto fail;
+ if (!skip_watch) {
+ if ((r = path_watch(p)) < 0)
+ goto fail;
+
+ /* Hmm, so now we have created inotify watches, but the file
+ * might have appeared/been removed by now, so we must
+ * recheck */
+ path_enter_waiting(p, false, true, true);
+ return;
+ }
path_set_state(p, PATH_WAITING);
return;
path_set_state(p, PATH_WAITING);
return;
@@
-410,7
+418,7
@@
static int path_start(Unit *u) {
return -ENOENT;
p->failure = false;
return -ENOENT;
p->failure = false;
- path_enter_waiting(p, true, true);
+ path_enter_waiting(p, true, true
, false
);
return 0;
}
return 0;
}
@@
-541,7
+549,7
@@
static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
if (changed)
path_enter_running(p);
else
if (changed)
path_enter_running(p);
else
- path_enter_waiting(p, false, true);
+ path_enter_waiting(p, false, true
, false
);
free(buf);
free(buf);
@@
-590,7
+598,7
@@
void path_unit_notify(Unit *u, UnitActiveState new_state) {
/* Hmm, so inotify was triggered since the
* last activation, so I guess we need to
* recheck what is going on. */
/* Hmm, so inotify was triggered since the
* last activation, so I guess we need to
* recheck what is going on. */
- path_enter_waiting(p, false, p->inotify_triggered);
+ path_enter_waiting(p, false, p->inotify_triggered
, false
);
}
}
}
}