add .clang-format
Change-Id: I6d9ec8401dcd46781ea258bf8998faa2507fa91d
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/watchdog.hpp b/watchdog.hpp
index e28a751..ea419e7 100644
--- a/watchdog.hpp
+++ b/watchdog.hpp
@@ -1,11 +1,13 @@
#pragma once
+#include "timer.hpp"
+
#include <systemd/sd-event.h>
+
#include <experimental/optional>
#include <sdbusplus/bus.hpp>
#include <sdbusplus/server/object.hpp>
#include <xyz/openbmc_project/State/Watchdog/server.hpp>
-#include "timer.hpp"
namespace phosphor
{
namespace watchdog
@@ -20,125 +22,123 @@
*/
class Watchdog : public WatchdogInherits
{
- public:
- Watchdog() = delete;
- ~Watchdog() = default;
- Watchdog(const Watchdog&) = delete;
- Watchdog& operator=(const Watchdog&) = delete;
- Watchdog(Watchdog&&) = delete;
- Watchdog& operator=(Watchdog &&) = delete;
+ public:
+ Watchdog() = delete;
+ ~Watchdog() = default;
+ Watchdog(const Watchdog&) = delete;
+ Watchdog& operator=(const Watchdog&) = delete;
+ Watchdog(Watchdog&&) = delete;
+ Watchdog& operator=(Watchdog&&) = delete;
- /** @brief Type used to hold the name of a systemd target.
- */
- using TargetName = std::string;
+ /** @brief Type used to hold the name of a systemd target.
+ */
+ using TargetName = std::string;
- /** @brief Type used to specify the parameters of a fallback watchdog
- */
- struct Fallback {
- Action action;
- uint64_t interval;
- bool always;
- };
+ /** @brief Type used to specify the parameters of a fallback watchdog
+ */
+ struct Fallback
+ {
+ Action action;
+ uint64_t interval;
+ bool always;
+ };
- /** @brief Constructs the Watchdog object
- *
- * @param[in] bus - DBus bus to attach to.
- * @param[in] objPath - Object path to attach to.
- * @param[in] event - reference to sd_event unique pointer
- * @param[in] actionTargets - map of systemd targets called on timeout
- * @param[in] fallback
- */
- Watchdog(sdbusplus::bus::bus& bus,
- const char* objPath,
- EventPtr& event,
- std::map<Action, TargetName>&& actionTargets =
- std::map<Action, TargetName>(),
- std::experimental::optional<Fallback>&&
- fallback = std::experimental::nullopt) :
- WatchdogInherits(bus, objPath),
- bus(bus),
- actionTargets(std::move(actionTargets)),
- fallback(std::move(fallback)),
- timer(event, std::bind(&Watchdog::timeOutHandler, this))
- {
- // We need to poke the enable mechanism to make sure that the timer
- // enters the fallback state if the fallback is always enabled.
- tryFallbackOrDisable();
- }
+ /** @brief Constructs the Watchdog object
+ *
+ * @param[in] bus - DBus bus to attach to.
+ * @param[in] objPath - Object path to attach to.
+ * @param[in] event - reference to sd_event unique pointer
+ * @param[in] actionTargets - map of systemd targets called on timeout
+ * @param[in] fallback
+ */
+ Watchdog(sdbusplus::bus::bus& bus, const char* objPath, EventPtr& event,
+ std::map<Action, TargetName>&& actionTargets =
+ std::map<Action, TargetName>(),
+ std::experimental::optional<Fallback>&& fallback =
+ std::experimental::nullopt) :
+ WatchdogInherits(bus, objPath),
+ bus(bus), actionTargets(std::move(actionTargets)),
+ fallback(std::move(fallback)),
+ timer(event, std::bind(&Watchdog::timeOutHandler, this))
+ {
+ // We need to poke the enable mechanism to make sure that the timer
+ // enters the fallback state if the fallback is always enabled.
+ tryFallbackOrDisable();
+ }
- /** @brief Resets the TimeRemaining to the configured Interval
- * Optionally enables the watchdog.
- *
- * @param[in] enableWatchdog - Should the call enable the watchdog
- */
- void resetTimeRemaining(bool enableWatchdog) override;
+ /** @brief Resets the TimeRemaining to the configured Interval
+ * Optionally enables the watchdog.
+ *
+ * @param[in] enableWatchdog - Should the call enable the watchdog
+ */
+ void resetTimeRemaining(bool enableWatchdog) override;
- /** @brief Since we are overriding the setter-enabled but not the
- * getter-enabled, we need to have this using in order to
- * allow passthrough usage of the getter-enabled.
- */
- using Base::Watchdog::enabled;
+ /** @brief Since we are overriding the setter-enabled but not the
+ * getter-enabled, we need to have this using in order to
+ * allow passthrough usage of the getter-enabled.
+ */
+ using Base::Watchdog::enabled;
- /** @brief Enable or disable watchdog
- * If a watchdog state is changed from disable to enable,
- * the watchdog timer is set with the default expiration
- * interval and it starts counting down.
- * If a watchdog is already enabled, setting @value to true
- * has no effect.
- *
- * @param[in] value - 'true' to enable. 'false' to disable
- *
- * @return : applied value if success, previous value otherwise
- */
- bool enabled(bool value) override;
+ /** @brief Enable or disable watchdog
+ * If a watchdog state is changed from disable to enable,
+ * the watchdog timer is set with the default expiration
+ * interval and it starts counting down.
+ * If a watchdog is already enabled, setting @value to true
+ * has no effect.
+ *
+ * @param[in] value - 'true' to enable. 'false' to disable
+ *
+ * @return : applied value if success, previous value otherwise
+ */
+ bool enabled(bool value) override;
- /** @brief Gets the remaining time before watchdog expires.
- *
- * @return 0 if watchdog is expired.
- * Remaining time in milliseconds otherwise.
- */
- uint64_t timeRemaining() const override;
+ /** @brief Gets the remaining time before watchdog expires.
+ *
+ * @return 0 if watchdog is expired.
+ * Remaining time in milliseconds otherwise.
+ */
+ uint64_t timeRemaining() const override;
- /** @brief Reset timer to expire after new timeout in milliseconds.
- *
- * @param[in] value - the time in milliseconds after which
- * the watchdog will expire
- *
- * @return: updated timeout value if watchdog is enabled.
- * 0 otherwise.
- */
- uint64_t timeRemaining(uint64_t value) override;
+ /** @brief Reset timer to expire after new timeout in milliseconds.
+ *
+ * @param[in] value - the time in milliseconds after which
+ * the watchdog will expire
+ *
+ * @return: updated timeout value if watchdog is enabled.
+ * 0 otherwise.
+ */
+ uint64_t timeRemaining(uint64_t value) override;
- /** @brief Tells if the referenced timer is expired or not */
- inline auto timerExpired() const
- {
- return timer.expired();
- }
+ /** @brief Tells if the referenced timer is expired or not */
+ inline auto timerExpired() const
+ {
+ return timer.expired();
+ }
- /** @brief Tells if the timer is running or not */
- inline bool timerEnabled() const
- {
- return timer.getEnabled() != SD_EVENT_OFF;
- }
+ /** @brief Tells if the timer is running or not */
+ inline bool timerEnabled() const
+ {
+ return timer.getEnabled() != SD_EVENT_OFF;
+ }
- private:
- /** @brief sdbusplus handle */
- sdbusplus::bus::bus& bus;
+ private:
+ /** @brief sdbusplus handle */
+ sdbusplus::bus::bus& bus;
- /** @brief Map of systemd units to be started when the timer expires */
- std::map<Action, TargetName> actionTargets;
+ /** @brief Map of systemd units to be started when the timer expires */
+ std::map<Action, TargetName> actionTargets;
- /** @brief Fallback timer options */
- std::experimental::optional<Fallback> fallback;
+ /** @brief Fallback timer options */
+ std::experimental::optional<Fallback> fallback;
- /** @brief Contained timer object */
- Timer timer;
+ /** @brief Contained timer object */
+ Timer timer;
- /** @brief Optional Callback handler on timer expirartion */
- void timeOutHandler();
+ /** @brief Optional Callback handler on timer expirartion */
+ void timeOutHandler();
- /** @brief Attempt to enter the fallback watchdog or disables it */
- void tryFallbackOrDisable();
+ /** @brief Attempt to enter the fallback watchdog or disables it */
+ void tryFallbackOrDisable();
};
} // namespace watchdog