X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=watchdog.c;h=ec10ba6188ca39138a46b805becc91a18ba2c059;hp=d927c53f42672734bd63706f46a5a7ddaa8c4aa4;hb=67eb7e68165bfa29ab57eb82f3e40eca17662365;hpb=36d79a90c28ac9d655ccd8261b3ac0b497a5aec1

diff --git a/watchdog.c b/watchdog.c
index d927c53..ec10ba6 100644
--- a/watchdog.c
+++ b/watchdog.c
@@ -31,21 +31,81 @@
 static struct uloop_timeout wdt_timeout;
 static int wdt_fd = -1;
 static int wdt_frequency = 5;
+static bool wdt_magicclose = false;
+
+void watchdog_ping(void)
+{
+	DEBUG(4, "Ping\n");
+	if (wdt_fd >= 0 && write(wdt_fd, "X", 1) < 0)
+		ERROR("WDT failed to write: %m\n");
+}
 
 static void watchdog_timeout_cb(struct uloop_timeout *t)
 {
-	DEBUG(2, "Ping\n");
-	if (write(wdt_fd, "X", 1) < 0)
-		ERROR("WDT failed to write: %s\n", strerror(errno));
+	watchdog_ping();
 	uloop_timeout_set(t, wdt_frequency * 1000);
 }
 
+static int watchdog_open(bool cloexec)
+{
+	char *env = getenv("WDTFD");
+
+	if (wdt_fd >= 0)
+		return wdt_fd;
+
+	if (env) {
+		DEBUG(2, "Watchdog handover: fd=%s\n", env);
+		wdt_fd = atoi(env);
+		unsetenv("WDTFD");
+	} else {
+		wdt_fd = open(WDT_PATH, O_WRONLY);
+	}
+
+	if (wdt_fd < 0)
+		return wdt_fd;
+
+	if (cloexec)
+		fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+
+	return wdt_fd;
+}
+
+static void watchdog_close(void)
+{
+	if (wdt_fd < 0)
+		return;
+
+	if (write(wdt_fd, "V", 1) < 0)
+		ERROR("WDT failed to write release: %m\n");
+
+	if (close(wdt_fd) == -1)
+		ERROR("WDT failed to close watchdog: %m\n");
+
+	wdt_fd = -1;
+}
+
+void watchdog_set_magicclose(bool val)
+{
+	wdt_magicclose = val;
+}
+
+bool watchdog_get_magicclose(void)
+{
+	return wdt_magicclose;
+}
+
 void watchdog_set_stopped(bool val)
 {
-	if (val)
+	if (val) {
 		uloop_timeout_cancel(&wdt_timeout);
-	else
+
+		if (wdt_magicclose)
+			watchdog_close();
+	}
+	else {
+		watchdog_open(true);
 		watchdog_timeout_cb(&wdt_timeout);
+	}
 }
 
 bool watchdog_get_stopped(void)
@@ -59,7 +119,7 @@ int watchdog_timeout(int 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);
@@ -73,7 +133,7 @@ int watchdog_frequency(int frequency)
 		return 0;
 
 	if (frequency) {
-		DEBUG(2, "Set watchdog frequency: %ds\n", frequency);
+		DEBUG(4, "Set watchdog frequency: %ds\n", frequency);
 		wdt_frequency = frequency;
 	}
 
@@ -93,29 +153,28 @@ char* watchdog_fd(void)
 
 void watchdog_init(int preinit)
 {
-	char *env = getenv("WDTFD");
-
-	if (wdt_fd >= 0)
-		return;
-
 	wdt_timeout.cb = watchdog_timeout_cb;
-	if (env) {
-		DEBUG(1, "Watchdog handover: fd=%s\n", env);
-		wdt_fd = atoi(env);
-		unsetenv("WDTFD");
-	} else {
-		wdt_fd = open("/dev/watchdog", O_WRONLY);
-	}
 
-	if (wdt_fd < 0)
+	if (watchdog_open(!preinit) < 0)
 		return;
 
-	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);
 
-	DEBUG(2, "Opened watchdog with timeout %ds\n", watchdog_timeout(0));
+	DEBUG(4, "Opened watchdog with timeout %ds\n", watchdog_timeout(0));
+}
+
+
+void watchdog_set_cloexec(bool val)
+{
+	if (wdt_fd < 0)
+		return;
+
+	int flags = fcntl(wdt_fd, F_GETFD);
+	if (val)
+		flags |= FD_CLOEXEC;
+	else
+		flags &= ~FD_CLOEXEC;
+	fcntl(wdt_fd, F_SETFD,  flags);
 }