Commit ee279c27 authored by Timur Tabi's avatar Timur Tabi Committed by Wim Van Sebroeck

Documentation/watchdog: use stdout instead of stderr in watchdog-test

The watchdog-test utility outputs all messages to stderr, even those
that are not error messages.  Output to stdout instead.

Instead of flushing the output after every write, just disabled
the output buffer.

Also display a dot for every ping of the watchdog, so that the user
knows that it's working.
Signed-off-by: default avatarTimur Tabi <timur@codeaurora.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 334da2d6
...@@ -23,6 +23,7 @@ static void keep_alive(void) ...@@ -23,6 +23,7 @@ static void keep_alive(void)
{ {
int dummy; int dummy;
printf(".");
ioctl(fd, WDIOC_KEEPALIVE, &dummy); ioctl(fd, WDIOC_KEEPALIVE, &dummy);
} }
...@@ -34,7 +35,7 @@ static void keep_alive(void) ...@@ -34,7 +35,7 @@ static void keep_alive(void)
static void term(int sig) static void term(int sig)
{ {
close(fd); close(fd);
fprintf(stderr, "Stopping watchdog ticks...\n"); printf("\nStopping watchdog ticks...\n");
exit(0); exit(0);
} }
...@@ -43,11 +44,12 @@ int main(int argc, char *argv[]) ...@@ -43,11 +44,12 @@ int main(int argc, char *argv[])
int flags; int flags;
unsigned int ping_rate = 1; unsigned int ping_rate = 1;
setbuf(stdout, NULL);
fd = open("/dev/watchdog", O_WRONLY); fd = open("/dev/watchdog", O_WRONLY);
if (fd == -1) { if (fd == -1) {
fprintf(stderr, "Watchdog device not enabled.\n"); printf("Watchdog device not enabled.\n");
fflush(stderr);
exit(-1); exit(-1);
} }
...@@ -55,36 +57,30 @@ int main(int argc, char *argv[]) ...@@ -55,36 +57,30 @@ int main(int argc, char *argv[])
if (!strncasecmp(argv[1], "-d", 2)) { if (!strncasecmp(argv[1], "-d", 2)) {
flags = WDIOS_DISABLECARD; flags = WDIOS_DISABLECARD;
ioctl(fd, WDIOC_SETOPTIONS, &flags); ioctl(fd, WDIOC_SETOPTIONS, &flags);
fprintf(stderr, "Watchdog card disabled.\n"); printf("Watchdog card disabled.\n");
fflush(stderr);
goto end; goto end;
} else if (!strncasecmp(argv[1], "-e", 2)) { } else if (!strncasecmp(argv[1], "-e", 2)) {
flags = WDIOS_ENABLECARD; flags = WDIOS_ENABLECARD;
ioctl(fd, WDIOC_SETOPTIONS, &flags); ioctl(fd, WDIOC_SETOPTIONS, &flags);
fprintf(stderr, "Watchdog card enabled.\n"); printf("Watchdog card enabled.\n");
fflush(stderr);
goto end; goto end;
} else if (!strncasecmp(argv[1], "-t", 2) && argv[2]) { } else if (!strncasecmp(argv[1], "-t", 2) && argv[2]) {
flags = atoi(argv[2]); flags = atoi(argv[2]);
ioctl(fd, WDIOC_SETTIMEOUT, &flags); ioctl(fd, WDIOC_SETTIMEOUT, &flags);
fprintf(stderr, "Watchdog timeout set to %u seconds.\n", flags); printf("Watchdog timeout set to %u seconds.\n", flags);
fflush(stderr);
goto end; goto end;
} else if (!strncasecmp(argv[1], "-p", 2) && argv[2]) { } else if (!strncasecmp(argv[1], "-p", 2) && argv[2]) {
ping_rate = strtoul(argv[2], NULL, 0); ping_rate = strtoul(argv[2], NULL, 0);
fprintf(stderr, "Watchdog ping rate set to %u seconds.\n", ping_rate); printf("Watchdog ping rate set to %u seconds.\n", ping_rate);
fflush(stderr);
} else { } else {
fprintf(stderr, "-d to disable, -e to enable, -t <n> to set " \ printf("-d to disable, -e to enable, -t <n> to set " \
"the timeout,\n-p <n> to set the ping rate, and \n"); "the timeout,\n-p <n> to set the ping rate, and \n");
fprintf(stderr, "run by itself to tick the card.\n"); printf("run by itself to tick the card.\n");
fflush(stderr);
goto end; goto end;
} }
} }
fprintf(stderr, "Watchdog Ticking Away!\n"); printf("Watchdog Ticking Away!\n");
fflush(stderr);
signal(SIGINT, term); signal(SIGINT, term);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment