Fix event_statistics_example

volt-software · Mar 12, 2023 · 82d6c71 · 82d6c71
1 parent 63880db
commit 82d6c71
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/build.sh b/build.sh
@@ -33,6 +33,7 @@ run_examples ()
   ../bin/ichor_http_example || exit 1
   ../bin/ichor_multithreaded_example || exit 1
   ../bin/ichor_optional_dependency_example || exit 1
+  ../bin/ichor_event_statistics_example || exit 1
   ../bin/ichor_serializer_example || exit 1
   ../bin/ichor_tcp_example || exit 1
   ../bin/ichor_timer_example || exit 1

diff --git a/examples/event_statistics_example/UsingStatisticsService.h b/examples/event_statistics_example/UsingStatisticsService.h
@@ -22,7 +22,7 @@ class UsingStatisticsService final : public AdvancedService<UsingStatisticsServi
         ICHOR_LOG_INFO(_logger, "UsingStatisticsService started");
         auto &quitTimer = _timerFactory->createTimer();
         auto &bogusTimer = _timerFactory->createTimer();
-        quitTimer.setChronoInterval(15s);
+        quitTimer.setChronoInterval(5s);
         bogusTimer.setChronoInterval(100ms);
 
         quitTimer.setCallback([this]() {

diff --git a/include/ichor/services/metrics/EventStatisticsService.h b/include/ichor/services/metrics/EventStatisticsService.h
@@ -39,7 +39,7 @@ namespace Ichor {
 
     class EventStatisticsService final : public IEventStatisticsService, public AdvancedService<EventStatisticsService> {
     public:
-        EventStatisticsService() = default;
+        EventStatisticsService(DependencyRegister &reg, Properties props);
         ~EventStatisticsService() final = default;
 
         const unordered_map<uint64_t, std::vector<StatisticEntry>>& getRecentStatistics() const noexcept final;
@@ -48,6 +48,9 @@ namespace Ichor {
         bool preInterceptEvent(Event const &evt);
         void postInterceptEvent(Event const &evt, bool processed);
 
+        void addDependencyInstance(ILogger &logger, IService &);
+        void removeDependencyInstance(ILogger &logger, IService&);
+
         void addDependencyInstance(ITimerFactory &factory, IService &);
         void removeDependencyInstance(ITimerFactory &factory, IService&);
 
@@ -66,6 +69,7 @@ namespace Ichor {
         bool _showStatisticsOnStop{false};
         uint64_t _averagingIntervalMs{5000};
         EventInterceptorRegistration _interceptorRegistration{};
+        ILogger *_logger{};
         ITimerFactory *_timerFactory{};
     };
 }
diff --git a/src/services/metrics/EventStatisticsService.cpp b/src/services/metrics/EventStatisticsService.cpp
@@ -2,6 +2,11 @@
 #include <ichor/DependencyManager.h>
 #include <numeric>
 
+Ichor::EventStatisticsService::EventStatisticsService(DependencyRegister &reg, Properties props) : AdvancedService<EventStatisticsService>(std::move(props)) {
+    reg.registerDependency<ITimerFactory>(this, true);
+    reg.registerDependency<ILogger>(this, true);
+}
+
 Ichor::Task<tl::expected<void, Ichor::StartError>> Ichor::EventStatisticsService::start() {
     if(getProperties().contains("ShowStatisticsOnStop")) {
         _showStatisticsOnStop = Ichor::any_cast<bool>(getProperties()["ShowStatisticsOnStop"]);
@@ -47,7 +52,7 @@ Ichor::Task<void> Ichor::EventStatisticsService::stop() {
             auto avg = std::accumulate(begin(statistics), end(statistics), 0L, [](int64_t i, const AveragedStatisticEntry &entry) -> int64_t { return i + entry.avgProcessingTimeRequired; }) / static_cast<int64_t>(statistics.size());
             auto occ = std::accumulate(begin(statistics), end(statistics), 0L, [](int64_t i, const AveragedStatisticEntry &entry){ return i + entry.occurrences; });
 
-            ICHOR_LOG_ERROR(GetThreadLocalManager().getLogger(), "Dm {:L} Event type {} occurred {:L} times, min/max/avg processing: {:L}/{:L}/{:L} ns", GetThreadLocalManager().getId(), _eventTypeToNameMapper[key], occ, min, max, avg);
+            ICHOR_LOG_ERROR(_logger, "Dm {:L} Event type {} occurred {:L} times, min/max/avg processing: {:L}/{:L}/{:L} ns", GetThreadLocalManager().getId(), _eventTypeToNameMapper[key], occ, min, max, avg);
         }
     }
 
@@ -84,6 +89,14 @@ void Ichor::EventStatisticsService::postInterceptEvent(Event const &evt, bool pr
     }
 }
 
+void Ichor::EventStatisticsService::addDependencyInstance(ILogger &logger, IService &) {
+    _logger = &logger;
+}
+
+void Ichor::EventStatisticsService::removeDependencyInstance(ILogger &, IService&) {
+    _logger = nullptr;
+}
+
 void Ichor::EventStatisticsService::addDependencyInstance(ITimerFactory &factory, IService &) {
     _timerFactory = &factory;
 }