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

watchdog: minor simplification of watchdog_runtime_wait()

Browse Source 
No functional change.
This commit is contained in:
Franck Bui
2021-09-06 14:31:30 +02:00
parent e94f9e720c
commit 9692ead197
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/watchdog.c
View File

@@ -120,20 +120,19 @@ int watchdog_set_timeout(usec_t timeout) {
}
usec_t watchdog_runtime_wait(void) {
usec_t rtwait, ntime;
if (!timestamp_is_set(watchdog_timeout))
return USEC_INFINITY;
/* Sleep half the watchdog timeout since the last successful ping at most */
if (timestamp_is_set(watchdog_last_ping)) {
ntime = now(clock_boottime_or_monotonic());
assert(ntime >= watchdog_last_ping);
rtwait = usec_sub_unsigned(watchdog_last_ping + (watchdog_timeout / 2), ntime);
} else
rtwait = watchdog_timeout / 2;
usec_t ntime = now(clock_boottime_or_monotonic());
return rtwait;
assert(ntime >= watchdog_last_ping);
return usec_sub_unsigned(watchdog_last_ping + (watchdog_timeout / 2), ntime);
}
return watchdog_timeout / 2;
}
int watchdog_ping(void) {