Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/miscutils/watchdog.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/miscutils/watchdog.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/miscutils/watchdog.c

@@ -4 +4 @@
  *
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
- * Copyright (C) 2006  Bernhard Fischer <busybox@busybox.net>
+ * Copyright (C) 2006  Bernhard Reutner-Fischer <busybox@busybox.net>
+ * Copyright (C) 2008  Darius Augulis <augulis.darius@gmail.com>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
+#include "linux/types.h" /* for __u32 */
+#include "linux/watchdog.h"
 
-#define OPT_FOREGROUND 0x01
-#define OPT_TIMER      0x02
+#define OPT_FOREGROUND  (1 << 0)
+#define OPT_STIMER      (1 << 1)
+#define OPT_HTIMER      (1 << 2)
 
-static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig) ATTRIBUTE_NORETURN;
-static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig)
+static void watchdog_shutdown(int sig UNUSED_PARAM)
 {
-    write(3, "V", 1);   /* Magic, see watchdog-api.txt in kernel */
+    static const char V = 'V';
+
+    write(3, &V, 1);  /* Magic, see watchdog-api.txt in kernel */
     if (ENABLE_FEATURE_CLEAN_UP)
         close(3);
-    exit(0);
+    _exit(EXIT_SUCCESS);
 }
 
-int watchdog_main(int argc, char **argv);
+int watchdog_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int watchdog_main(int argc, char **argv)
 {
+    static const struct suffix_mult suffixes[] = {
+        { "ms", 1 },
+        { "", 1000 },
+        { "", 0 }
+    };
+
     unsigned opts;
-    unsigned timer_duration = 30; /* Userspace timer duration, in seconds */
-    char *t_arg;
+    unsigned stimer_duration; /* how often to restart */
+    unsigned htimer_duration = 60000; /* reboots after N ms if not restarted */
+    char *st_arg;
+    char *ht_arg;
 
-    opt_complementary = "=1"; /* must have 1 argument */
-    opts = getopt32(argv, "Ft:", &t_arg);
+    opt_complementary = "=1"; /* must have exactly 1 argument */
+    opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg);
 
-    if (opts & OPT_TIMER)
-        timer_duration = xatou(t_arg);
+    /* We need to daemonize *before* opening the watchdog as many drivers
+     * will only allow one process at a time to do so.  Since daemonizing
+     * is not perfect (child may run before parent finishes exiting), we
+     * can't rely on parent exiting before us (let alone *cleanly* releasing
+     * the watchdog fd -- something else that may not even be allowed).
+     */
+    if (!(opts & OPT_FOREGROUND))
+        bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
 
-    if (!(opts & OPT_FOREGROUND)) {
-        bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
-    }
+    if (opts & OPT_HTIMER)
+        htimer_duration = xatou_sfx(ht_arg, suffixes);
+    stimer_duration = htimer_duration / 2;
+    if (opts & OPT_STIMER)
+        stimer_duration = xatou_sfx(st_arg, suffixes);
 
-    signal(SIGHUP, watchdog_shutdown);
-    signal(SIGINT, watchdog_shutdown);
+    bb_signals(BB_FATAL_SIGS, watchdog_shutdown);
 
     /* Use known fd # - avoid needing global 'int fd' */
     xmove_fd(xopen(argv[argc - 1], O_WRONLY), 3);
 
+    /* WDIOC_SETTIMEOUT takes seconds, not milliseconds */
+    htimer_duration = htimer_duration / 1000;
+#ifndef WDIOC_SETTIMEOUT
+# error WDIOC_SETTIMEOUT is not defined, cannot compile watchdog applet
+#else
+# if defined WDIOC_SETOPTIONS && defined WDIOS_ENABLECARD
+    {
+        static const int enable = WDIOS_ENABLECARD;
+        ioctl_or_warn(3, WDIOC_SETOPTIONS, (void*) &enable);
+    }
+# endif
+    ioctl_or_warn(3, WDIOC_SETTIMEOUT, &htimer_duration);
+#endif
+
+#if 0
+    ioctl_or_warn(3, WDIOC_GETTIMEOUT, &htimer_duration);
+    printf("watchdog: SW timer is %dms, HW timer is %ds\n",
+        stimer_duration, htimer_duration * 1000);
+#endif
+
     while (1) {
         /*
-         * Make sure we clear the counter before sleeping, as the counter value
-         * is undefined at this point -- PFM
+         * Make sure we clear the counter before sleeping,
+         * as the counter value is undefined at this point -- PFM
          */
-        write(3, "", 1);
-        sleep(timer_duration);
+        write(3, "", 1); /* write zero byte */
+        usleep(stimer_duration * 1000L);
     }
-
-    watchdog_shutdown(0);
-    /* return EXIT_SUCCESS; */
+    return EXIT_SUCCESS; /* - not reached, but gcc 4.2.1 is too dumb! */
 }