diff options
author | Matthew Barth <msbarth@us.ibm.com> | 2017-05-31 13:45:36 -0500 |
---|---|---|
committer | Matthew Barth <msbarth@us.ibm.com> | 2017-06-05 09:19:18 -0500 |
commit | 34f1bda245818e659f4af44361c81f21dba09b76 (patch) | |
tree | 8e6ed6896a672e5e5739612819b6bea776de42d2 /control/zone.hpp | |
parent | df3e8d67fd8afb78105f516eac360d0a7d44326f (diff) | |
download | phosphor-fan-presence-34f1bda245818e659f4af44361c81f21dba09b76.tar.gz phosphor-fan-presence-34f1bda245818e659f4af44361c81f21dba09b76.zip |
Use updated match methods for signal callbacks
Attach the event handler callback function to the match along with
generating the match string using the new match methods
Change-Id: I7595d65cbc615f29db60e2a65534ee5b635d6f96
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Diffstat (limited to 'control/zone.hpp')
-rw-r--r-- | control/zone.hpp | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/control/zone.hpp b/control/zone.hpp index c6e0594..5825b52 100644 --- a/control/zone.hpp +++ b/control/zone.hpp @@ -146,7 +146,7 @@ class Zone /** * @brief List of signal event arguments */ - std::vector<std::unique_ptr<SignalEvent>> _signalEvents; + std::vector<std::unique_ptr<EventData>> _signalEvents; /** * @brief list of Dbus matches for callbacks @@ -170,24 +170,13 @@ class Zone T& value); /** - * @brief Dbus signal change handler + * @brief Dbus signal change callback handler * - * @param[in] msg - Data associated with the subscribed signal - * @param[in] data - Pointer to the event sensor's data - * @param[in] err - Contains any sdbus error reference if occurred - */ - static int signalHandler(sd_bus_message* msg, - void* data, - sd_bus_error* err); - - /** - * @brief Envokes the assigned handler and action - * - * @param[in] msg - Expanded sdbusplus message data - * @param[in] eventData - The event's data - */ - void handleEvent(sdbusplus::message::message& msg, - const EventData& eventData); + * @param[in] msg - Expanded sdbusplus message data + * @param[in] eventData - The single event's data + */ + void handleEvent(sdbusplus::message::message& msg, + const EventData* eventData); }; } |