From 7a4ea79501b85addf16e2c06ffc835708c5264ad Mon Sep 17 00:00:00 2001 From: Vernon Mauery Date: Thu, 25 Oct 2018 13:09:29 -0700 Subject: netipmid: Remove unused event references Now that all the provider libraries are only loaded by the main ipmid queue, there are no callers for the event object, so it can be removed. The same goes for the event loop; all users of the sd_event object have been replaced with boost::asio, so it can be removed. Change-Id: Id271c4960a2c5386d6163cc9baecdc368e5e328f Signed-off-by: Vernon Mauery --- main.cpp | 9 --------- sd_event_loop.cpp | 3 --- sd_event_loop.hpp | 3 --- 3 files changed, 15 deletions(-) diff --git a/main.cpp b/main.cpp index 27661c1..8fc27f4 100644 --- a/main.cpp +++ b/main.cpp @@ -34,7 +34,6 @@ std::tuple sdbusp; @@ -70,14 +69,6 @@ int main() return rc; } - /* Get an sd event handler */ - rc = sd_event_default(&events); - if (rc < 0) - { - log("Failure to create sd_event", - entry("ERROR=%s", strerror(-rc))); - return EXIT_FAILURE; - } sdbusp = std::make_shared(*io, bus); // Register callback to update cache for a GUID change and cache the GUID diff --git a/sd_event_loop.cpp b/sd_event_loop.cpp index 8c9abf4..ee25960 100644 --- a/sd_event_loop.cpp +++ b/sd_event_loop.cpp @@ -48,9 +48,6 @@ void EventLoop::startRmcpReceive() int EventLoop::startEventLoop() { - sdbusplus::asio::sd_event_wrapper sdEvents(*io); - event = sdEvents.get(); - // set up boost::asio signal handling boost::asio::signal_set signals(*io, SIGINT, SIGTERM); signals.async_wait( diff --git a/sd_event_loop.hpp b/sd_event_loop.hpp index 10b24ed..a626490 100644 --- a/sd_event_loop.hpp +++ b/sd_event_loop.hpp @@ -31,9 +31,6 @@ class EventLoop */ int startEventLoop(); - /** @brief Event loop object. */ - sd_event* event = nullptr; - private: /** @brief async handler for incoming udp packets */ void handleRmcpPacket(); -- cgit v1.2.1