emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: allow millisecond spec (-t 250ms)

Browse Source 
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
This commit is contained in:
Denis Vlasenko 2007-09-05 12:13:51 +00:00
parent 211f7f88ae
commit 3638cc4462
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/usage.h
View File

@ -3843,7 +3843,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when
#define watch_full_usage \ #define watch_full_usage \
"Execute a program periodically" \ "Execute a program periodically" \
"\n\nOptions:\n" \ "\n\nOptions:\n" \
" -n Loop period in seconds - default is 2\n" \ " -n Loop period in seconds (default 2)\n" \
" -t Don't print header" " -t Don't print header"
#define watch_example_usage \ #define watch_example_usage \
"$ watch date\n" \ "$ watch date\n" \
@ -3852,12 +3852,14 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when
"Mon Dec 17 10:31:44 GMT 2000" "Mon Dec 17 10:31:44 GMT 2000"
#define watchdog_trivial_usage \ #define watchdog_trivial_usage \
"[-t seconds] [-F] DEV" "[-t N[ms]] [-F] DEV"
#define watchdog_full_usage \ #define watchdog_full_usage \
"Periodically write to watchdog device DEV" \ "Periodically write to watchdog device DEV" \
"\n\nOptions:\n" \ "\n\nOptions:" \
" -t Timer period in seconds - default is 30\n" \ "\n -t N Timer period (default 30)" \
" -F Stay in the foreground and don't fork" "\n -F Stay in the foreground and don't fork" \
"\n" \
"\nUse -t 500ms to specify period in milliseconds"
#define wc_trivial_usage \ #define wc_trivial_usage \
"[OPTION]... [FILE]..." "[OPTION]... [FILE]..."

24
miscutils/watchdog.c
View File

@ -16,7 +16,9 @@
static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig) ATTRIBUTE_NORETURN; static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig) ATTRIBUTE_NORETURN;
static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig) 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) if (ENABLE_FEATURE_CLEAN_UP)
close(3); close(3);
exit(0); exit(0);
@ -26,14 +28,20 @@ int watchdog_main(int argc, char **argv);
int watchdog_main(int argc, char **argv) int watchdog_main(int argc, char **argv)
{ {
unsigned opts; unsigned opts;
unsigned timer_duration = 30; /* Userspace timer duration, in seconds */ unsigned timer_duration = 30000; /* Userspace timer duration, in milliseconds */
char *t_arg; char *t_arg;
opt_complementary = "=1"; /* must have 1 argument */ opt_complementary = "=1"; /* must have 1 argument */
opts = getopt32(argv, "Ft:", &t_arg); opts = getopt32(argv, "Ft:", &t_arg);
if (opts & OPT_TIMER) if (opts & OPT_TIMER) {
timer_duration = xatou(t_arg); static const struct suffix_mult suffixes[] = {
{ "ms", 1 },
{ "", 1000 },
{ }
};
timer_duration = xatou_sfx(t_arg, suffixes);
}
if (!(opts & OPT_FOREGROUND)) { if (!(opts & OPT_FOREGROUND)) {
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); 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 * Make sure we clear the counter before sleeping, as the counter value
* is undefined at this point -- PFM * is undefined at this point -- PFM
*/ */
write(3, "", 1); write(3, "", 1); /* write zero byte */
sleep(timer_duration); usleep(timer_duration * 1000L);
} }
return EXIT_SUCCESS; /* - not reached, but gcc 4.2.1 is too dumb! */
watchdog_shutdown(0);
/* return EXIT_SUCCESS; */
} }