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: rename watchdog_set_timeout() into watchdog_setup()

Browse Source 
"watchdog_set_timeout()" was misleading as the function is not just a setter -
it must be called for activating the watchdog device.
This commit is contained in:
Franck Bui
2021-09-14 22:36:14 +02:00
parent 9692ead197
commit d74965e6fe
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/main.c
View File

@@ -1539,7 +1539,7 @@ static int become_shutdown(
/* If we reboot or kexec let's set the shutdown watchdog and
* tell the shutdown binary to repeatedly ping it */
r = watchdog_set_timeout(watchdog_timer);
r = watchdog_setup(watchdog_timer);
watchdog_close(r < 0);
/* Tell the binary how often to ping, ignore failure */

4
src/core/manager.c
View File

@@ -3205,7 +3205,7 @@ void manager_set_watchdog(Manager *m, WatchdogType t, usec_t timeout) {
if (t == WATCHDOG_RUNTIME)
if (!timestamp_is_set(m->watchdog_overridden[WATCHDOG_RUNTIME])) {
if (timestamp_is_set(timeout))
(void) watchdog_set_timeout(timeout);
(void) watchdog_setup(timeout);
else
watchdog_close(true);
}
@@ -3227,7 +3227,7 @@ int manager_override_watchdog(Manager *m, WatchdogType t, usec_t timeout) {
usec_t usec = timestamp_is_set(timeout) ? timeout : m->watchdog[t];
if (timestamp_is_set(usec))
(void) watchdog_set_timeout(usec);
(void) watchdog_setup(usec);
else
watchdog_close(true);
}

4
src/shared/watchdog.c
View File

@@ -101,7 +101,7 @@ int watchdog_set_device(char *path) {
return r;
}
int watchdog_set_timeout(usec_t timeout) {
int watchdog_setup(usec_t timeout) {
/* Initialize the watchdog timeout with the caller value. This value is
* going to be updated by update_timeout() with the closest value
@@ -191,6 +191,6 @@ void watchdog_close(bool disarm) {
watchdog_fd = safe_close(watchdog_fd);
/* Once closed, pinging the device becomes a NOP and we request a new
* call to watchdog_set_timeout() to open the device again. */
* call to watchdog_setup() to open the device again. */
watchdog_timeout = USEC_INFINITY;
}

2
src/shared/watchdog.h
View File

@@ -7,7 +7,7 @@
#include "util.h"
int watchdog_set_device(char *path);
int watchdog_set_timeout(usec_t timeout);
int watchdog_setup(usec_t timeout);
int watchdog_ping(void);
void watchdog_close(bool disarm);
usec_t watchdog_runtime_wait(void);

2
src/shutdown/shutdown.c
View File

@@ -387,7 +387,7 @@ int main(int argc, char *argv[]) {
log_warning_errno(r, "Failed to parse watchdog timeout '%s', ignoring: %m",
watchdog_usec);
else
(void) watchdog_set_timeout(usec);
(void) watchdog_setup(usec);
}
/* Lock us into memory */

2
src/test/test-watchdog.c
View File

@@ -20,7 +20,7 @@ int main(int argc, char *argv[]) {
t = slow ? 10 * USEC_PER_SEC : 1 * USEC_PER_SEC;
count = slow ? 5 : 3;
r = watchdog_set_timeout(t);
r = watchdog_setup(t);
if (r < 0)
log_warning_errno(r, "Failed to open watchdog: %m");
if (r == -EPERM)