service: optimize relaying stdio output of daemons a bit.

[project/procd.git] / watchdog.c

diff --git a/watchdog.c b/watchdog.c
index e4b82f5..592ae7e 100644 (file)
--- a/watchdog.c
+++ b/watchdog.c
@@ -32,11 +32,16 @@ static struct uloop_timeout wdt_timeout;
 static int wdt_fd = -1;
 static int wdt_frequency = 5;
 
 static int wdt_fd = -1;
 static int wdt_frequency = 5;
 

-static void watchdog_timeout_cb(struct uloop_timeout *t)
+void watchdog_ping(void)

 {
 {

-       DEBUG(2, "Ping\n");
-       if (write(wdt_fd, "X", 1) < 0)
+       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: %s\n", strerror(errno));

+}
+
+static void watchdog_timeout_cb(struct uloop_timeout *t)
+{
+       watchdog_ping();

        uloop_timeout_set(t, wdt_frequency * 1000);
 }
 
        uloop_timeout_set(t, wdt_frequency * 1000);
 }
 


@@ -59,7 +64,7 @@ int watchdog_timeout(int timeout)
                return 0;
 
        if (timeout) {
                return 0;
 
        if (timeout) {

-               DEBUG(2, "Set watchdog timeout: %ds\n", timeout);
+               DEBUG(4, "Set watchdog timeout: %ds\n", timeout);

                ioctl(wdt_fd, WDIOC_SETTIMEOUT, &timeout);
        }
        ioctl(wdt_fd, WDIOC_GETTIMEOUT, &timeout);
                ioctl(wdt_fd, WDIOC_SETTIMEOUT, &timeout);
        }
        ioctl(wdt_fd, WDIOC_GETTIMEOUT, &timeout);


@@ -73,7 +78,7 @@ int watchdog_frequency(int frequency)
                return 0;
 
        if (frequency) {
                return 0;
 
        if (frequency) {

-               DEBUG(2, "Set watchdog frequency: %ds\n", frequency);
+               DEBUG(4, "Set watchdog frequency: %ds\n", frequency);

                wdt_frequency = frequency;
        }
 
                wdt_frequency = frequency;
        }
 


@@ -91,25 +96,40 @@ char* watchdog_fd(void)
        return fd_buf;
 }
 
        return fd_buf;
 }
 

-void watchdog_init(void)
+void watchdog_init(int preinit)

 {
        char *env = getenv("WDTFD");
 
 {
        char *env = getenv("WDTFD");
 

+       if (wdt_fd >= 0)
+               return;

 
        wdt_timeout.cb = watchdog_timeout_cb;
        if (env) {
 
        wdt_timeout.cb = watchdog_timeout_cb;
        if (env) {

-               DEBUG(1, "Watchdog handover: fd=%s\n", env);
+               DEBUG(2, "Watchdog handover: fd=%s\n", env);

                wdt_fd = atoi(env);
                unsetenv("WDTFD");
        } else {
                wdt_fd = open("/dev/watchdog", O_WRONLY);
        }
                wdt_fd = atoi(env);
                unsetenv("WDTFD");
        } else {
                wdt_fd = open("/dev/watchdog", O_WRONLY);
        }

+

        if (wdt_fd < 0)
                return;
        if (wdt_fd < 0)
                return;

-       fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+
+       if (!preinit)
+               fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+

        LOG("- watchdog -\n");
        watchdog_timeout(30);
        watchdog_timeout_cb(&wdt_timeout);
 
        LOG("- watchdog -\n");
        watchdog_timeout(30);
        watchdog_timeout_cb(&wdt_timeout);
 

-       DEBUG(2, "Opened watchdog with timeout %ds\n", watchdog_timeout(0));
+       DEBUG(4, "Opened watchdog with timeout %ds\n", watchdog_timeout(0));
+}
+
+
+void watchdog_no_cloexec(void)
+{
+       if (wdt_fd < 0)
+               return;
+
+       fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) & ~FD_CLOEXEC);

 }
 }