procd: skip respawn in case device disappeared

[project/procd.git] / watchdog.c

diff --git a/watchdog.c b/watchdog.c
index 97c8337e0b31ee696f484483e5871be94a2cf408..9d770b4470a946ec37cc65d5769445ecd544997b 100644 (file)
--- a/watchdog.c
+++ b/watchdog.c
@@ -30,6 +30,7 @@
 
 static struct uloop_timeout wdt_timeout;
 static int wdt_fd = -1;
+static int wdt_drv_timeout = 30;
 static int wdt_frequency = 5;
 static bool wdt_magicclose = false;
 
@@ -37,7 +38,7 @@ void watchdog_ping(void)
 {
        DEBUG(4, "Ping\n");
        if (wdt_fd >= 0 && write(wdt_fd, "X", 1) < 0)
-               ERROR("WDT failed to write: %s\n", strerror(errno));
+               ERROR("WDT failed to write: %m\n");
 }
 
 static void watchdog_timeout_cb(struct uloop_timeout *t)
@@ -76,14 +77,22 @@ static void watchdog_close(void)
                return;
 
        if (write(wdt_fd, "V", 1) < 0)
-               ERROR("WDT failed to write release: %s\n", strerror(errno));
+               ERROR("WDT failed to write release: %m\n");
 
        if (close(wdt_fd) == -1)
-               ERROR("WDT failed to close watchdog: %s\n", strerror(errno));
+               ERROR("WDT failed to close watchdog: %m\n");
 
        wdt_fd = -1;
 }
 
+static int watchdog_set_drv_timeout(void)
+{
+       if (wdt_fd < 0)
+               return -1;
+
+       return ioctl(wdt_fd, WDIOC_SETTIMEOUT, &wdt_drv_timeout);
+}
+
 void watchdog_set_magicclose(bool val)
 {
        wdt_magicclose = val;
@@ -104,6 +113,7 @@ void watchdog_set_stopped(bool val)
        }
        else {
                watchdog_open(true);
+               watchdog_set_drv_timeout();
                watchdog_timeout_cb(&wdt_timeout);
        }
 }
@@ -115,23 +125,19 @@ bool watchdog_get_stopped(void)
 
 int watchdog_timeout(int timeout)
 {
-       if (wdt_fd < 0)
-               return 0;
-
        if (timeout) {
                DEBUG(4, "Set watchdog timeout: %ds\n", timeout);
-               ioctl(wdt_fd, WDIOC_SETTIMEOUT, &timeout);
+               wdt_drv_timeout = timeout;
+
+               if (wdt_fd >= 0)
+                       watchdog_set_drv_timeout();
        }
-       ioctl(wdt_fd, WDIOC_GETTIMEOUT, &timeout);
 
-       return timeout;
+       return wdt_drv_timeout;
 }
 
 int watchdog_frequency(int frequency)
 {
-       if (wdt_fd < 0)
-               return 0;
-
        if (frequency) {
                DEBUG(4, "Set watchdog frequency: %ds\n", frequency);
                wdt_frequency = frequency;
@@ -142,10 +148,11 @@ int watchdog_frequency(int frequency)
 
 char* watchdog_fd(void)
 {
-       static char fd_buf[3];
+       static char fd_buf[12];
 
        if (wdt_fd < 0)
                return NULL;
+
        snprintf(fd_buf, sizeof(fd_buf), "%d", wdt_fd);
 
        return fd_buf;
@@ -159,7 +166,7 @@ void watchdog_init(int preinit)
                return;
 
        LOG("- watchdog -\n");
-       watchdog_timeout(30);
+       watchdog_set_drv_timeout();
        watchdog_timeout_cb(&wdt_timeout);
 
        DEBUG(4, "Opened watchdog with timeout %ds\n", watchdog_timeout(0));