summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2018-10-24 12:49:30 -0700
committerVernon Mauery <vernon.mauery@linux.intel.com>2018-11-09 08:37:04 -0800
commitb108806f78fbcf51da3a449c690a617939e204de (patch)
tree25a612be5a4f7ea8cc6c48fb31a953162adc5508 /main.cpp
parent36baa14b1d3dae811d46fd6b137a4ad7990a92b5 (diff)
downloadphosphor-net-ipmid-b108806f78fbcf51da3a449c690a617939e204de.tar.gz
phosphor-net-ipmid-b108806f78fbcf51da3a449c690a617939e204de.zip
netipmid: Remove local timer class
Remove the local timer class, migrating to the sdbusplus/timer.hpp class for now. As the project moves toward the single ipmi execution queue the timers will all go away anyway in preference to the asio timers. Tested-by: making changes to the network via rmcp+ with ipmitool. This should make use of the networkTimer variable that was changed from the internal timer class to the sdbusplus timer class. Change-Id: I4a86e3b9c1f3cfefee1e112229dcb63aa5119f2f Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 4aa0792..847c991 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,7 +8,6 @@
#include "provider_registration.hpp"
#include "socket_channel.hpp"
#include "sol_module.hpp"
-#include "timer.hpp"
#include <assert.h>
#include <dirent.h>
@@ -20,6 +19,7 @@
#include <unistd.h>
#include <iostream>
+#include <sdbusplus/timer.hpp>
#include <tuple>
// Tuple of Global Singletons
@@ -36,7 +36,7 @@ sd_bus* bus = nullptr;
sd_event* events = nullptr;
// Global timer for network changes
-std::unique_ptr<phosphor::ipmi::Timer> networkTimer = nullptr;
+std::unique_ptr<phosphor::Timer> networkTimer = nullptr;
FILE* ipmidbus = nullptr;
static unsigned short selReservationID = 0xFFFF;
OpenPOWER on IntegriCloud