Mailing List Archive

From: Leigh Brown <leigh@solinno.co.uk>

Rework xenwatchdogd signal handling to do the minimum in the signal
handler. This is a very minor enhancement.

Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
---
tools/misc/xenwatchdogd.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/misc/xenwatchdogd.c b/tools/misc/xenwatchdogd.c
index 2f7c822d61..35a0df655a 100644
--- a/tools/misc/xenwatchdogd.c
+++ b/tools/misc/xenwatchdogd.c
@@ -9,9 +9,11 @@
#include <unistd.h>
#include <signal.h>
#include <stdio.h>
+#include <stdbool.h>

xc_interface *h;
-int id = 0;
+static bool safeexit = false;
+static bool done = false;

void daemonize(void)
{
@@ -38,20 +40,18 @@ void daemonize(void)

void catch_exit(int sig)
{
- if (id)
- xc_watchdog(h, id, 300);
- exit(EXIT_SUCCESS);
+ done = true;
}

void catch_usr1(int sig)
{
- if (id)
- xc_watchdog(h, id, 0);
- exit(EXIT_SUCCESS);
+ safeexit = true;
+ done = true;
}

int main(int argc, char **argv)
{
+ int id;
int t, s;
int ret;

@@ -90,10 +90,14 @@ int main(int argc, char **argv)
if (id <= 0)
err(EXIT_FAILURE, "xc_watchdog setup");

- for (;;) {
+ while (!done) {
sleep(s);
ret = xc_watchdog(h, id, t);
if (ret != 0)
err(EXIT_FAILURE, "xc_watchdog");
}
+
+ // Zero seconds timeout will disarm the watchdog timer
+ xc_watchdog(h, id, safeexit ? 0 : 300);
+ return 0;
}
--
2.39.2