| Message ID | 1537817767-78918-2-git-send-email-jerry.hoemann@hpe.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [V2] selftests: watchdog: Add gettimeout and get|set pretimeout | expand |
Hi Jerry, On 09/24/2018 01:36 PM, Jerry Hoemann wrote: > Add command line arguments to call ioctl WDIOC_GETTIMEOUT, > WDIOC_GETPRETIMEOUT and WDIOC_SETPRETIMEOUT. > > Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> > --- > tools/testing/selftests/watchdog/watchdog-test.c | 33 +++++++++++++++++++++++- > 1 file changed, 32 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c > index 6e29087..3e8e393 100644 > --- a/tools/testing/selftests/watchdog/watchdog-test.c > +++ b/tools/testing/selftests/watchdog/watchdog-test.c > @@ -19,7 +19,7 @@ > > int fd; > const char v = 'V'; > -static const char sopts[] = "bdehp:t:"; > +static const char sopts[] = "bdehp:t:Tn:N"; > static const struct option lopts[] = { > {"bootstatus", no_argument, NULL, 'b'}, > {"disable", no_argument, NULL, 'd'}, > @@ -27,6 +27,9 @@ > {"help", no_argument, NULL, 'h'}, > {"pingrate", required_argument, NULL, 'p'}, > {"timeout", required_argument, NULL, 't'}, > + {"gettimeout", no_argument, NULL, 'T'}, > + {"pretimeout", required_argument, NULL, 'n'}, > + {"getpretimeout", no_argument, NULL, 'N'}, > {NULL, no_argument, NULL, 0x0} > }; > > @@ -71,9 +74,13 @@ static void usage(char *progname) > printf(" -h, --help Print the help message\n"); > printf(" -p, --pingrate=P Set ping rate to P seconds (default %d)\n", DEFAULT_PING_RATE); > printf(" -t, --timeout=T Set timeout to T seconds\n"); > + printf(" -T, --gettimeout Get the timeout\n"); > + printf(" -n, --pretimeout=T Set the pretimeout to T seconds\n"); > + printf(" -N, --getpretimeout Get the pretimeout\n"); > printf("\n"); > printf("Parameters are parsed left-to-right in real-time.\n"); > printf("Example: %s -d -t 10 -p 5 -e\n", progname); > + printf("Example: %s -t 12 -T -n 7 -N\n", progname); Would this work the way you want it though, since -N now is oneshot? Should this be just "printf("Example: %s -t 12 -T -n 7\n", progname); ?? The rest looks good to me. > } > > int main(int argc, char *argv[]) > @@ -135,6 +142,30 @@ int main(int argc, char *argv[]) > else > printf("WDIOC_SETTIMEOUT errno '%s'\n", strerror(errno)); > break; > + case 'T': > + oneshot = 1; > + ret = ioctl(fd, WDIOC_GETTIMEOUT, &flags); > + if (!ret) > + printf("WDIOC_GETTIMEOUT returns %u seconds.\n", flags); > + else > + printf("WDIOC_GETTIMEOUT errno '%s'\n", strerror(errno)); > + break; > + case 'n': > + flags = strtoul(optarg, NULL, 0); > + ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags); > + if (!ret) > + printf("Watchdog pretimeout set to %u seconds.\n", flags); > + else > + printf("WDIOC_SETPRETIMEOUT errno '%s'\n", strerror(errno)); > + break; > + case 'N': > + oneshot = 1; > + ret = ioctl(fd, WDIOC_GETPRETIMEOUT, &flags); > + if (!ret) > + printf("WDIOC_GETPRETIMEOUT returns %u seconds.\n", flags); > + else > + printf("WDIOC_GETPRETIMEOUT errno '%s'\n", strerror(errno)); > + break; > default: > usage(argv[0]); > goto end; > thanks, -- Shuah
On Tue, Sep 25, 2018 at 02:51:15PM -0600, Shuah Khan wrote: > Hi Jerry, > > On 09/24/2018 01:36 PM, Jerry Hoemann wrote: > > {"disable", no_argument, NULL, 'd'}, > > @@ -27,6 +27,9 @@ > > {"help", no_argument, NULL, 'h'}, > > {"pingrate", required_argument, NULL, 'p'}, > > {"timeout", required_argument, NULL, 't'}, > > + {"gettimeout", no_argument, NULL, 'T'}, > > + {"pretimeout", required_argument, NULL, 'n'}, > > + {"getpretimeout", no_argument, NULL, 'N'}, > > {NULL, no_argument, NULL, 0x0} > > }; > > > > @@ -71,9 +74,13 @@ static void usage(char *progname) > > printf(" -h, --help Print the help message\n"); > > printf(" -p, --pingrate=P Set ping rate to P seconds (default %d)\n", DEFAULT_PING_RATE); > > printf(" -t, --timeout=T Set timeout to T seconds\n"); > > + printf(" -T, --gettimeout Get the timeout\n"); > > + printf(" -n, --pretimeout=T Set the pretimeout to T seconds\n"); > > + printf(" -N, --getpretimeout Get the pretimeout\n"); > > printf("\n"); > > printf("Parameters are parsed left-to-right in real-time.\n"); > > printf("Example: %s -d -t 10 -p 5 -e\n", progname); > > + printf("Example: %s -t 12 -T -n 7 -N\n", progname); > > Would this work the way you want it though, since -N now is oneshot? > Should this be just "printf("Example: %s -t 12 -T -n 7\n", progname); ?? Example shows how to set/query the timers to make sure value set was what was intended. Note: "oneshot" is a bit of a misnomer as it causes clean exit before going into the keep alive loop, but one can still specify multiple options. > > The rest looks good to me. > > > } > > > > int main(int argc, char *argv[]) > > @@ -135,6 +142,30 @@ int main(int argc, char *argv[]) > > else > > printf("WDIOC_SETTIMEOUT errno '%s'\n", strerror(errno)); > > break; > > + case 'T': > > + oneshot = 1; > > + ret = ioctl(fd, WDIOC_GETTIMEOUT, &flags); > > + if (!ret) > > + printf("WDIOC_GETTIMEOUT returns %u seconds.\n", flags); > > + else > > + printf("WDIOC_GETTIMEOUT errno '%s'\n", strerror(errno)); > > + break; > > + case 'n': > > + flags = strtoul(optarg, NULL, 0); > > + ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags); > > + if (!ret) > > + printf("Watchdog pretimeout set to %u seconds.\n", flags); > > + else > > + printf("WDIOC_SETPRETIMEOUT errno '%s'\n", strerror(errno)); > > + break; > > + case 'N': > > + oneshot = 1; > > + ret = ioctl(fd, WDIOC_GETPRETIMEOUT, &flags); > > + if (!ret) > > + printf("WDIOC_GETPRETIMEOUT returns %u seconds.\n", flags); > > + else > > + printf("WDIOC_GETPRETIMEOUT errno '%s'\n", strerror(errno)); > > + break; > > default: > > usage(argv[0]); > > goto end; > > > > thanks, > -- Shuah
On 09/26/2018 10:29 AM, Jerry Hoemann wrote: > On Tue, Sep 25, 2018 at 02:51:15PM -0600, Shuah Khan wrote: >> Hi Jerry, >> >> On 09/24/2018 01:36 PM, Jerry Hoemann wrote: >>> {"disable", no_argument, NULL, 'd'}, >>> @@ -27,6 +27,9 @@ >>> {"help", no_argument, NULL, 'h'}, >>> {"pingrate", required_argument, NULL, 'p'}, >>> {"timeout", required_argument, NULL, 't'}, >>> + {"gettimeout", no_argument, NULL, 'T'}, >>> + {"pretimeout", required_argument, NULL, 'n'}, >>> + {"getpretimeout", no_argument, NULL, 'N'}, >>> {NULL, no_argument, NULL, 0x0} >>> }; >>> >>> @@ -71,9 +74,13 @@ static void usage(char *progname) >>> printf(" -h, --help Print the help message\n"); >>> printf(" -p, --pingrate=P Set ping rate to P seconds (default %d)\n", DEFAULT_PING_RATE); >>> printf(" -t, --timeout=T Set timeout to T seconds\n"); >>> + printf(" -T, --gettimeout Get the timeout\n"); >>> + printf(" -n, --pretimeout=T Set the pretimeout to T seconds\n"); >>> + printf(" -N, --getpretimeout Get the pretimeout\n"); >>> printf("\n"); >>> printf("Parameters are parsed left-to-right in real-time.\n"); >>> printf("Example: %s -d -t 10 -p 5 -e\n", progname); >>> + printf("Example: %s -t 12 -T -n 7 -N\n", progname); >> >> Would this work the way you want it though, since -N now is oneshot? >> Should this be just "printf("Example: %s -t 12 -T -n 7\n", progname); ?? > > > Example shows how to set/query the timers to make sure value set was what > was intended. > > Note: "oneshot" is a bit of a misnomer as it causes clean exit before > going into the keep alive loop, but one can still specify multiple > options. > > >> >> The rest looks good to me. I spoke too soon. I ran your patch on softdog and error messages in unsupported cases could you refinement. Please see below: Sorry for not catching this earlier. >> >>> } >>> >>> int main(int argc, char *argv[]) >>> @@ -135,6 +142,30 @@ int main(int argc, char *argv[]) >>> else >>> printf("WDIOC_SETTIMEOUT errno '%s'\n", strerror(errno)); >>> break; >>> + case 'T': >>> + oneshot = 1; >>> + ret = ioctl(fd, WDIOC_GETTIMEOUT, &flags); >>> + if (!ret) >>> + printf("WDIOC_GETTIMEOUT returns %u seconds.\n", flags); >>> + else >>> + printf("WDIOC_GETTIMEOUT errno '%s'\n", strerror(errno)); Either remove "errno" or change it to "error '%s'" >>> + break; >>> + case 'n': >>> + flags = strtoul(optarg, NULL, 0); >>> + ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags); >>> + if (!ret) >>> + printf("Watchdog pretimeout set to %u seconds.\n", flags); >>> + else >>> + printf("WDIOC_SETPRETIMEOUT errno '%s'\n", strerror(errno)); Same as above. >>> + break; >>> + case 'N': >>> + oneshot = 1; >>> + ret = ioctl(fd, WDIOC_GETPRETIMEOUT, &flags); >>> + if (!ret) >>> + printf("WDIOC_GETPRETIMEOUT returns %u seconds.\n", flags); >>> + else >>> + printf("WDIOC_GETPRETIMEOUT errno '%s'\n", strerror(errno)); Same as above. >>> + break; >>> default: >>> usage(argv[0]); >>> goto end; >>> >> thanks, -- Shuah
On Wed, Sep 26, 2018 at 01:47:25PM -0600, Shuah Khan wrote: > On 09/26/2018 10:29 AM, Jerry Hoemann wrote: > > On Tue, Sep 25, 2018 at 02:51:15PM -0600, Shuah Khan wrote: > >> Hi Jerry, > >> > >> > >> The rest looks good to me. > > I spoke too soon. I ran your patch on softdog and error messages in unsupported > cases could you refinement. Please see below: > > Sorry for not catching this earlier. > > >> > >>> } > >>> > >>> int main(int argc, char *argv[]) > >>> @@ -135,6 +142,30 @@ int main(int argc, char *argv[]) > >>> else > >>> printf("WDIOC_SETTIMEOUT errno '%s'\n", strerror(errno)); > >>> break; > >>> + case 'T': > >>> + oneshot = 1; > >>> + ret = ioctl(fd, WDIOC_GETTIMEOUT, &flags); > >>> + if (!ret) > >>> + printf("WDIOC_GETTIMEOUT returns %u seconds.\n", flags); > >>> + else > >>> + printf("WDIOC_GETTIMEOUT errno '%s'\n", strerror(errno)); > > Either remove "errno" or change it to "error '%s'" Oh, I see. I did a cut/paste from prior printf in file which have same issue. I'll fix those while I'm at it.
On 09/26/2018 02:03 PM, Jerry Hoemann wrote: > On Wed, Sep 26, 2018 at 01:47:25PM -0600, Shuah Khan wrote: >> On 09/26/2018 10:29 AM, Jerry Hoemann wrote: >>> On Tue, Sep 25, 2018 at 02:51:15PM -0600, Shuah Khan wrote: >>>> Hi Jerry, >>>> >>>> >>>> The rest looks good to me. >> >> I spoke too soon. I ran your patch on softdog and error messages in unsupported >> cases could you refinement. Please see below: >> >> Sorry for not catching this earlier. >> >>>> >>>>> } >>>>> >>>>> int main(int argc, char *argv[]) >>>>> @@ -135,6 +142,30 @@ int main(int argc, char *argv[]) >>>>> else >>>>> printf("WDIOC_SETTIMEOUT errno '%s'\n", strerror(errno)); >>>>> break; >>>>> + case 'T': >>>>> + oneshot = 1; >>>>> + ret = ioctl(fd, WDIOC_GETTIMEOUT, &flags); >>>>> + if (!ret) >>>>> + printf("WDIOC_GETTIMEOUT returns %u seconds.\n", flags); >>>>> + else >>>>> + printf("WDIOC_GETTIMEOUT errno '%s'\n", strerror(errno)); >> >> Either remove "errno" or change it to "error '%s'" > > Oh, I see. I did a cut/paste from prior printf in file which have same issue. > I'll fix those while I'm at it. > > > Thanks. That will be awesome. -- Shuah
diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c index 6e29087..3e8e393 100644 --- a/tools/testing/selftests/watchdog/watchdog-test.c +++ b/tools/testing/selftests/watchdog/watchdog-test.c @@ -19,7 +19,7 @@ int fd; const char v = 'V'; -static const char sopts[] = "bdehp:t:"; +static const char sopts[] = "bdehp:t:Tn:N"; static const struct option lopts[] = { {"bootstatus", no_argument, NULL, 'b'}, {"disable", no_argument, NULL, 'd'}, @@ -27,6 +27,9 @@ {"help", no_argument, NULL, 'h'}, {"pingrate", required_argument, NULL, 'p'}, {"timeout", required_argument, NULL, 't'}, + {"gettimeout", no_argument, NULL, 'T'}, + {"pretimeout", required_argument, NULL, 'n'}, + {"getpretimeout", no_argument, NULL, 'N'}, {NULL, no_argument, NULL, 0x0} }; @@ -71,9 +74,13 @@ static void usage(char *progname) printf(" -h, --help Print the help message\n"); printf(" -p, --pingrate=P Set ping rate to P seconds (default %d)\n", DEFAULT_PING_RATE); printf(" -t, --timeout=T Set timeout to T seconds\n"); + printf(" -T, --gettimeout Get the timeout\n"); + printf(" -n, --pretimeout=T Set the pretimeout to T seconds\n"); + printf(" -N, --getpretimeout Get the pretimeout\n"); printf("\n"); printf("Parameters are parsed left-to-right in real-time.\n"); printf("Example: %s -d -t 10 -p 5 -e\n", progname); + printf("Example: %s -t 12 -T -n 7 -N\n", progname); } int main(int argc, char *argv[]) @@ -135,6 +142,30 @@ int main(int argc, char *argv[]) else printf("WDIOC_SETTIMEOUT errno '%s'\n", strerror(errno)); break; + case 'T': + oneshot = 1; + ret = ioctl(fd, WDIOC_GETTIMEOUT, &flags); + if (!ret) + printf("WDIOC_GETTIMEOUT returns %u seconds.\n", flags); + else + printf("WDIOC_GETTIMEOUT errno '%s'\n", strerror(errno)); + break; + case 'n': + flags = strtoul(optarg, NULL, 0); + ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags); + if (!ret) + printf("Watchdog pretimeout set to %u seconds.\n", flags); + else + printf("WDIOC_SETPRETIMEOUT errno '%s'\n", strerror(errno)); + break; + case 'N': + oneshot = 1; + ret = ioctl(fd, WDIOC_GETPRETIMEOUT, &flags); + if (!ret) + printf("WDIOC_GETPRETIMEOUT returns %u seconds.\n", flags); + else + printf("WDIOC_GETPRETIMEOUT errno '%s'\n", strerror(errno)); + break; default: usage(argv[0]); goto end;
Add command line arguments to call ioctl WDIOC_GETTIMEOUT, WDIOC_GETPRETIMEOUT and WDIOC_SETPRETIMEOUT. Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> --- tools/testing/selftests/watchdog/watchdog-test.c | 33 +++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)