aboutsummaryrefslogtreecommitdiff
path: root/miscutils/watchdog.c
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-09-05 12:13:51 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-09-05 12:13:51 +0000
commit3638cc44629703585f29f4b7125da1e7b3a1aedc (patch)
tree52dbab8d922a2144715cd01497f48ced362a6bee /miscutils/watchdog.c
parent211f7f88ae67e875bed50409b2edbb6d740fc648 (diff)
downloadbusybox-3638cc44629703585f29f4b7125da1e7b3a1aedc.tar.gz
busybox-3638cc44629703585f29f4b7125da1e7b3a1aedc.tar.bz2
watchdog: allow millisecond spec (-t 250ms)
function old new delta packed_usage 23069 23113 +44 static.suffixes - 24 +24 watchdog_main 147 160 +13 static.V - 1 +1 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 2/0 up/down: 82/0) Total: 82 bytes
Diffstat (limited to 'miscutils/watchdog.c')
-rw-r--r--miscutils/watchdog.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index aa367d5ab..14bd44f48 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -16,7 +16,9 @@
static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig) ATTRIBUTE_NORETURN;
static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig)
{
- 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);
@@ -26,14 +28,20 @@ int watchdog_main(int argc, char **argv);
int watchdog_main(int argc, char **argv)
{
unsigned opts;
- unsigned timer_duration = 30; /* Userspace timer duration, in seconds */
+ unsigned timer_duration = 30000; /* Userspace timer duration, in milliseconds */
char *t_arg;
opt_complementary = "=1"; /* must have 1 argument */
opts = getopt32(argv, "Ft:", &t_arg);
- if (opts & OPT_TIMER)
- timer_duration = xatou(t_arg);
+ if (opts & OPT_TIMER) {
+ static const struct suffix_mult suffixes[] = {
+ { "ms", 1 },
+ { "", 1000 },
+ { }
+ };
+ timer_duration = xatou_sfx(t_arg, suffixes);
+ }
if (!(opts & OPT_FOREGROUND)) {
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
@@ -50,10 +58,8 @@ int watchdog_main(int argc, char **argv)
* 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(timer_duration * 1000L);
}
-
- watchdog_shutdown(0);
- /* return EXIT_SUCCESS; */
+ return EXIT_SUCCESS; /* - not reached, but gcc 4.2.1 is too dumb! */
}