projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert log calls to ulog() api
[project/procd.git]
/
watchdog.c
diff --git
a/watchdog.c
b/watchdog.c
index
d927c53
..
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 (w
dt_fd >= 0 && w
rite(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;
}
@@
-100,7
+105,7
@@
void watchdog_init(int preinit)
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 = atoi(env);
unsetenv("WDTFD");
} else {
@@
-117,5
+122,14
@@
void watchdog_init(int preinit)
watchdog_timeout(30);
watchdog_timeout_cb(&wdt_timeout);
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);
}
}