watchdog: Use ResetTimeRemaining for wd_reset

Using this helper method reduces the number of dbus calls made during
each watchdog reset.

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

1 files changed, 22 insertions, 0 deletions

diff --git a/app/watchdog_service.cpp b/app/watchdog_service.cpp
index c95c092..26962dc 100644
--- a/app/watchdog_service.cpp
+++ b/app/watchdog_service.cpp
@@ -32,6 +32,28 @@ WatchdogService::WatchdogService()
 {
 }
 
+void WatchdogService::resetTimeRemaining(bool enableWatchdog)
+{
+    bool wasValid = wd_service.isValid(bus);
+    auto request = wd_service.newMethodCall(
+            bus, wd_intf, "ResetTimeRemaining");
+    request.append(enableWatchdog);
+    auto response = bus.call(request);
+    if (response.is_method_error())
+    {
+        wd_service.invalidate();
+        if (wasValid)
+        {
+            // Retry the request once in case the cached service was stale
+            return resetTimeRemaining(enableWatchdog);
+        }
+        log<level::ERR>(
+                "WatchdogService: Method error resetting time remaining",
+                entry("ENABLE_WATCHDOG=%d", !!enableWatchdog));
+        elog<InternalFailure>();
+    }
+}
+
 WatchdogService::Properties WatchdogService::getProperties()
 {
     bool wasValid = wd_service.isValid(bus);