From 5db6fc3027ff67cd4fddaa87c10be2924fa4fe11 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Mon, 29 Aug 2022 10:26:11 -0700 Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-10547 Signed-off-by: stephb9959 --- build | 2 +- src/RESTAPI/RESTAPI_board_timepoint_handler.cpp | 7 ++++++- src/framework/MicroService.h | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build b/build index c793025..f11c82a 100644 --- a/build +++ b/build @@ -1 +1 @@ -7 \ No newline at end of file +9 \ No newline at end of file diff --git a/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp b/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp index e24587b..f2cfba6 100644 --- a/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp +++ b/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp @@ -120,10 +120,15 @@ namespace OpenWifi { // sort by timestamp & serial number. struct { - bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const { +/* bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const { if(lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true; if(lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false; return lhs.timestamp < rhs.timestamp; +*/ + bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const { + if(lhs.timestamp < rhs.timestamp) return true; + if(lhs.timestamp > rhs.timestamp) return false; + return lhs.device_info.serialNumber < rhs.device_info.serialNumber; } } DeviceTimePoint_sort; diff --git a/src/framework/MicroService.h b/src/framework/MicroService.h index ae1a608..a62b46c 100644 --- a/src/framework/MicroService.h +++ b/src/framework/MicroService.h @@ -3046,6 +3046,7 @@ namespace OpenWifi { RESTServers_.clear(); } + inline void reinitialize(Poco::Util::Application &self) override; inline Poco::Net::HTTPRequestHandler *CallServer(const std::string &Path, uint64_t Id) { @@ -3053,6 +3054,7 @@ namespace OpenWifi { Utils::SetThreadName(fmt::format("x-rest:{}",Id).c_str()); return RESTAPI_ExtRouter(Path, Bindings, Logger(), Server_, Id); } + const Poco::ThreadPool & Pool() { return Pool_; } private: std::vector> RESTServers_; @@ -3185,6 +3187,8 @@ namespace OpenWifi { Utils::SetThreadName(fmt::format("i-rest:{}",Id).c_str()); return RESTAPI_IntRouter(Path, Bindings, Logger(), Server_, Id); } + + const Poco::ThreadPool & Pool() { return Pool_; } private: std::vector> RESTServers_; Poco::ThreadPool Pool_{"i-rest",2,16};