watchdog: timeRemaining doesn't need to check enabled

The Timer is fully owned by the Watchdog and is only enabled when the
watchdog is enabled. Therefore, we only need to check the state of the
tim

watchdog: timeRemaining doesn't need to check enabled

The Timer is fully owned by the Watchdog and is only enabled when the
watchdog is enabled. Therefore, we only need to check the state of the
timer instead of the interface and timer before populating the
timeRemaining value. This simplifies later patches and does not make any
functional change.

Change-Id: Ib11edd75eb1953360bf4eae7fc4b29b5251cf0c5
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

tests: Make private members protected

Googletest derived classes should never have private members unless they
are inteded to not be accessible to class functions. Since class
functions are derived

tests: Make private members protected

Googletest derived classes should never have private members unless they
are inteded to not be accessible to class functions. Since class
functions are derived from the provided class, the private members are
unable to be accessed by the test cases. In a future change we need access
to one of these members so make them protected.

Change-Id: Iadbb53adc748d02168a1fc83f738f86437a1d15c
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

test/watchdog: Use a unique_ptr for the watchdog

This lets us change out the watchdog with a watchdog constructed using
different parameters. Currently this functionality is not used, but it
is need

test/watchdog: Use a unique_ptr for the watchdog

This lets us change out the watchdog with a watchdog constructed using
different parameters. Currently this functionality is not used, but it
is needed for a future change.

Change-Id: Ie1e7fbf2c7fc8bf2949237f2535177ecd46944a0
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

tests: Convert EXPECT_EQ(bool -> EXPECT_{TRUE,FALSE}

This is more in line with normal gtest code style.

Change-Id: If49f700f756ad8d278927baae4e934ef7aa399d7
Signed-off-by: William A. Kennington III

tests: Convert EXPECT_EQ(bool -> EXPECT_{TRUE,FALSE}

This is more in line with normal gtest code style.

Change-Id: If49f700f756ad8d278927baae4e934ef7aa399d7
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

argument: Fix alignment of help text

When printed on the terminal the description of the command line options
is supposed to be aligned for all options. The --action_target argument
is currently not

argument: Fix alignment of help text

When printed on the terminal the description of the command line options
is supposed to be aligned for all options. The --action_target argument
is currently not aligned with any of the other arguments. Fix this.

Change-Id: I170d445a5e490c5d6e99379b8b704992a51fca3c
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

argument: Fix missing action_target

Our help output and mainapp code support setting an action_target but
our argument parser doesn't actually interpret the option. This was
mistakenly left out of a

argument: Fix missing action_target

Our help output and mainapp code support setting an action_target but
our argument parser doesn't actually interpret the option. This was
mistakenly left out of a previous commit after refactoring.

Change-Id: Ieff5d1a457b9f2b998533b8cefd0251ccb8655f1
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

argument: Fix help output spacing

Some of the help text lines are missing spaces between words. This
commit makes the formatting more consistent such that spaces are always
placed at the end of line

argument: Fix help output spacing

Some of the help text lines are missing spaces between words. This
commit makes the formatting more consistent such that spaces are always
placed at the end of lines that do not contain a newline character. Now
we have the correct spacing in the help output.

Change-Id: I01d3f25c95f178afd02263ccc05c664a72bd479d
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

timer: Add missing functional include

std::function is not found with a GCC 7.2 runtime.

Change-Id: Ic7eaf4012a2992ee4a58f2dda827f0625a9ae96f
Tested: Built repository with GCC 7.2
Signed-off-by: Br

timer: Add missing functional include

std::function is not found with a GCC 7.2 runtime.

Change-Id: Ic7eaf4012a2992ee4a58f2dda827f0625a9ae96f
Tested: Built repository with GCC 7.2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

show more ...

mainapp: Parse action -> target mappings on the command line

This adds the argument --action_target=<action>=<systemd_target>.
Depending on the HostAction that is set when the watchdog expires we ca

mainapp: Parse action -> target mappings on the command line

This adds the argument --action_target=<action>=<systemd_target>.
Depending on the HostAction that is set when the watchdog expires we can
start different systemd targets. The configuration of this mapping is
now configurable at the command line.

Change-Id: I7482e038d9abafc81cec0df15345cbfc670dbed2
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

mainapp: Print out the action -> target map at startup

We have multiple methods for setting the action to systemd target
mappings on the command line. This makes it more clear to the end user
what t

mainapp: Print out the action -> target map at startup

We have multiple methods for setting the action to systemd target
mappings on the command line. This makes it more clear to the end user
what the daemon interprets as the final mapping when it starts up.

Change-Id: Ib57dc04575a578bba54f5bf8cb47d6a61690d3a3
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

watchdog: Support multiple timeout actions

This change adds the infrastructure to support having different actions
map to different systemd targets being started when the watchdog
expires. Right now

watchdog: Support multiple timeout actions

This change adds the infrastructure to support having different actions
map to different systemd targets being started when the watchdog
expires. Right now this maintains compatability with the current
--target argument and populates all of the watchdog actions, except for
None, with the same target. A follow up patch will implement setting
independent targets for each action.

Change-Id: I0f0601f9e94d488650f20a9cebfc7c967007d78c
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

test/Makefile: Build test sources using automake targets

If you specify object files for LDADD it will use some kind of built in
rules for building those objects instead of adding the proper CFLAGS

test/Makefile: Build test sources using automake targets

If you specify object files for LDADD it will use some kind of built in
rules for building those objects instead of adding the proper CFLAGS to
the compile process. This results in build failures if the CFLAGS were
actually needed to compile those objects.

Change-Id: I1b7837c41fb5fc840d8b913802cfcdc0ee800455
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

argument: Support multiple arguments

This will be used in future patches. Right now this should retain
similar behavior to the current argument parsing semantics. The
difference is we now require ar

argument: Support multiple arguments

This will be used in future patches. Right now this should retain
similar behavior to the current argument parsing semantics. The
difference is we now require arguments to be specified only once and
error if they are specified multiple times.

Change-Id: I21e4cf9734f045c2b0991f7ed0ec6e6a569eec7d
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

Revert "watchdog: Log watchdog updates for debug"

Current users of this code like the witherspoon platform generate a lot
of debug messages that they save to flash. While this seems like it
should b

Revert "watchdog: Log watchdog updates for debug"

Current users of this code like the witherspoon platform generate a lot
of debug messages that they save to flash. While this seems like it
should be solved by not persisting debug messages lets back off on this
extra messaging for now.

This reverts commit 539f56069b07f39413789fa9ae4c7085fbc092b4.

Change-Id: If0e2161c15447df8d1a4804e9e061f1d9aa35c5c
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

argument: Implement test cases

The argument parser had a few subtle bugs and could use some tests.

Change-Id: I0adbc507a822a6887fbf02b888b1f678b3cc7b35
Signed-off-by: William A. Kennington III <wak

argument: Implement test cases

The argument parser had a few subtle bugs and could use some tests.

Change-Id: I0adbc507a822a6887fbf02b888b1f678b3cc7b35
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

argument: Clean up argv types to match standard definitions

Change-Id: Idabdaac7b7a3879d6a2e18e46df986a1543df48f
Signed-off-by: William A. Kennington III <wak@google.com>

configure/make: Allow googletest from pkg-config

Change-Id: I2eb526827987dd2361d35fd782229b1461d49d01
Signed-off-by: William A. Kennington III <wak@google.com>

argument: Fix use of optarg

getopt supports no_argument, required_argument, and optional_argument
types of arguments. Getopt returns NULL in optarg if no argument was
given in the case of no_argumen

argument: Fix use of optarg

getopt supports no_argument, required_argument, and optional_argument
types of arguments. Getopt returns NULL in optarg if no argument was
given in the case of no_argument or optional_argument types. Use this
value to determine if we should use optarg or trueString.

Change-Id: I414c4d3c2923844cff13a070357269c5b48048c9
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

argument: Continue doesn't take an argument

Change-Id: If36f15254e0883a366f5cece76e87906f420cadb
Signed-off-by: William A. Kennington III <wak@google.com>

argument: Fix flag typo

Change-Id: I409db7d3e8042217312225ac642b312541c48981
Signed-off-by: William A. Kennington III <wak@google.com>

watchdog: Log watchdog updates for debug

Change-Id: Ida0a2f58e128d037fdbb5d94259f1637be67d8ae
Signed-off-by: William A. Kennington III <wak@google.com>

argument: Reset optind before using getopt

The getopt family of functions are globally stateful, we need to make
sure that we reset the global state before using it otherwise we can't
create argumen

argument: Reset optind before using getopt

The getopt family of functions are globally stateful, we need to make
sure that we reset the global state before using it otherwise we can't
create arguments more than once.

Change-Id: Ic673eb3592217329b95fde033a1f2773b6b980bf
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

Spelling fixes

Change-Id: I3a85e921f87401701f3ebb22e972e0d3f9cf19c1
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>

Don't set Interval by setting TimeRemaining

This change allows one to set the TimeRemaining as a one-time shot,
and also allows more straightforward control.

-Changing the Interval doesn't reset th

Don't set Interval by setting TimeRemaining

This change allows one to set the TimeRemaining as a one-time shot,
and also allows more straightforward control.

-Changing the Interval doesn't reset the watchdog or update the
TimeRemaining.
-Changing the TimeRemaining doesn't set the Interval for future
cycles.

Change-Id: I03a3cdb9cc9e5c4bc034dc86d2b4324a5a4b7243
Signed-off-by: Patrick Venture <venture@google.com>

show more ...

Add option for daemon to continue running after timeout

Added new command line option that lets someone disable the
watchdog timer on timer expiration instead of the default
action of it exiting.

C

Add option for daemon to continue running after timeout

Added new command line option that lets someone disable the
watchdog timer on timer expiration instead of the default
action of it exiting.

Change-Id: I1c3414d4378872860ac083836cda4809fa26237a
Signed-off-by: Patrick Venture <venture@google.com>

show more ...