dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

udevadm-wait: wait for two periodic timer triggered before exit

Browse Source
This commit is contained in:
Yu Watanabe
2022-09-03 02:05:30 +09:00
parent 9d7c7de9bd
commit f6bb2e5189
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/udev/udevadm-wait.c
View File

@@ -257,6 +257,7 @@ static int setup_timer(sd_event *event) {
static int reset_timer(sd_event *e, sd_event_source **s);
static int on_periodic_timer(sd_event_source *s, uint64_t usec, void *userdata) {
static unsigned counter = 0;
sd_event *e;
int r;
@@ -264,9 +265,16 @@ static int on_periodic_timer(sd_event_source *s, uint64_t usec, void *userdata)
e = sd_event_source_get_event(s);
r = check_and_exit(e);
if (r != 0)
return r;
/* Even if all devices exists, we try to wait for uevents to be emitted from kernel. */
if (check())
counter++;
else
counter = 0;
if (counter >= 2) {
log_debug("All requested devices popped up without receiving kernel uevents.");
return sd_event_exit(e, 0);
}
r = reset_timer(e, &s);
if (r < 0)
@@ -290,6 +298,11 @@ static int setup_periodic_timer(sd_event *event) {
if (r < 0)
return r;
/* Set the lower priority than device monitor, to make uevents always dispatched first. */
r = sd_event_source_set_priority(s, SD_EVENT_PRIORITY_NORMAL + 1);
if (r < 0)
return r;
return sd_event_source_set_floating(s, true);
}