Adress requested changes

tud-zih-energy · Aug 22, 2023 · cc4b46c · cc4b46c
1 parent 5971636
commit cc4b46c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/include/lo2s/monitor/io_monitor.hpp b/include/lo2s/monitor/io_monitor.hpp
@@ -41,7 +41,7 @@ class IoMonitor : public PollMonitor
 {
 public:
     IoMonitor(trace::Trace& trace)
-    : monitor::PollMonitor(trace, "", config().perf_read_interval), multi_reader_(trace)
+    : monitor::PollMonitor(trace, "IoMonitor", config().perf_read_interval), multi_reader_(trace)
 
     {
         for (auto fd : multi_reader_.get_fds())

diff --git a/include/lo2s/perf/multi_reader.hpp b/include/lo2s/perf/multi_reader.hpp
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <lo2s/log.hpp>
 #include <lo2s/perf/bio/writer.hpp>
 #include <lo2s/perf/io_reader.hpp>
 #include <lo2s/perf/time/converter.hpp>
@@ -31,6 +32,7 @@
 #include <otf2xx/event/metric.hpp>
 #include <otf2xx/writer/local.hpp>
 
+#include <functional>
 #include <queue>
 #include <unordered_map>
 #include <vector>

diff --git a/src/perf/sample/writer.cpp b/src/perf/sample/writer.cpp
@@ -172,21 +172,13 @@ bool Writer::handle(const Reader::RecordSwitchType* context_switch)
     auto tp = time_converter_(context_switch->time);
     tp = adjust_timepoints(tp);
 
+    bool is_switch_out = context_switch->header.misc & PERF_RECORD_MISC_SWITCH_OUT;
     update_calling_context(Process(context_switch->pid), Thread(context_switch->tid), tp,
-                           context_switch->header.misc & PERF_RECORD_MISC_SWITCH_OUT);
+                           is_switch_out);
 
-    if (context_switch->header.misc & PERF_RECORD_MISC_SWITCH_OUT)
-    {
-        cpuid_metric_event_.timestamp(tp);
-        cpuid_metric_event_.raw_values()[0] = -1;
-        otf2_writer_ << cpuid_metric_event_;
-    }
-    else
-    {
-        cpuid_metric_event_.timestamp(tp);
-        cpuid_metric_event_.raw_values()[0] = context_switch->cpu;
-        otf2_writer_ << cpuid_metric_event_;
-    }
+    cpuid_metric_event_.timestamp(tp);
+    cpuid_metric_event_.raw_values()[0] = is_switch_out ? -1 : context_switch->cpu;
+    otf2_writer_ << cpuid_metric_event_;
 
     return false;
 }