From 15f7092285a7310a1706c35aece08b41a2e5647c Mon Sep 17 00:00:00 2001
From: Michael Mueller <michael.mueller@uos.de>
Date: Thu, 24 Oct 2024 14:26:41 +0200
Subject: [PATCH] Revised blinktree to include core allocation times in
 measurements.

---
 .../blinktree_benchmark/benchmark.cpp          | 18 ++++++++++++------
 .../blinktree/blinktree_benchmark/benchmark.h  | 15 +++++++--------
 .../app/blinktree/blinktree_benchmark/main.cpp |  5 +++--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.cpp b/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.cpp
index 701669552c..06bef0da41 100644
--- a/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.cpp
+++ b/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.cpp
@@ -81,7 +81,7 @@ void Benchmark::start()
     {
         mx::tasking::runtime::profile(this->profile_file_name());
     }
-    /*his->_chronometer.start(static_cast<std::uint16_t>(static_cast<benchmark::phase>(this->_workload)),
+    /*this->_chronometer.start(static_cast<std::uint16_t>(static_cast<benchmark::phase>(this->_workload)),
                              this->_current_iteration + 1, this->_cores.current());*/
     //Genode::log("Timer started ");
 }
@@ -217,11 +217,17 @@ void Benchmark::requests_finished()
             this->_tree.reset(nullptr);
         }
 
-        auto *restart_task = mx::tasking::runtime::new_task<RestartTask>(0U, *this);
-        restart_task->annotate(static_cast<mx::tasking::TaskInterface::channel>(0));
-        mx::tasking::runtime::spawn(*restart_task, core_id);
-        mx::tasking::runtime::resume();
-
+        if (this->core_set()) {
+            this->_chronometer.start(static_cast<std::uint16_t>(static_cast<benchmark::phase>(this->_workload)),
+                             this->_current_iteration + 1, this->_cores.current());
+            auto *restart_task = mx::tasking::runtime::new_task<RestartTask>(0U, *this);
+            restart_task->annotate(static_cast<mx::tasking::TaskInterface::channel>(0));
+            mx::tasking::runtime::spawn(*restart_task, core_id);
+            mx::tasking::runtime::resume();
+        } else {
+            Genode::log("Benchmark finished.");
+            mx::tasking::runtime::stop();
+        }
     }
 }
 
diff --git a/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.h b/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.h
index e99cde1c9e..19c8dc012d 100644
--- a/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.h
+++ b/repos/mml/src/app/blinktree/blinktree_benchmark/benchmark.h
@@ -52,6 +52,11 @@ public:
      */
     void start();
 
+    void start_chronometer() {
+        this->_chronometer.start(static_cast<std::uint16_t>(static_cast<benchmark::phase>(this->_workload)),
+                                this->_current_iteration + 1, this->_cores.current());
+    }
+
 private:
     // Collection of cores the benchmark should run on.
     benchmark::Cores _cores;
@@ -121,8 +126,7 @@ class StartMeasurementTask : public mx::tasking::TaskInterface
 
         mx::tasking::TaskResult execute(const std::uint16_t core_id, const std::uint16_t channel_id) override 
         {
-            Genode::log("Starting timer");
-            _benchmark._chronometer.start(static_cast<std::uint16_t>(static_cast<benchmark::phase>(_benchmark._workload)), _benchmark._current_iteration + 1, _benchmark._cores.current());
+            //_benchmark._chronometer.start(static_cast<std::uint16_t>(static_cast<benchmark::phase>(_benchmark._workload)), _benchmark._current_iteration + 1, _benchmark._cores.current());
             //_benchmark._start = Genode::Trace::timestamp();
             return mx::tasking::TaskResult::make_remove();
         }
@@ -155,12 +159,7 @@ class RestartTask : public mx::tasking::TaskInterface
 
         mx::tasking::TaskResult execute(const std::uint16_t core_id, const std::uint16_t channel_id) override
         {
-            if (_benchmark.core_set()) {
-                _benchmark.start();
-            } else {
-                Genode::log("Benchmark finished.");
-                mx::tasking::runtime::stop();
-            }
+            _benchmark.start();
             return mx::tasking::TaskResult::make_remove();
         }
 };
diff --git a/repos/mml/src/app/blinktree/blinktree_benchmark/main.cpp b/repos/mml/src/app/blinktree/blinktree_benchmark/main.cpp
index 0c8960b6a7..33824519c5 100644
--- a/repos/mml/src/app/blinktree/blinktree_benchmark/main.cpp
+++ b/repos/mml/src/app/blinktree/blinktree_benchmark/main.cpp
@@ -51,6 +51,7 @@ int bt_main(Libc::Env &env, int count_arguments, char **arguments)
     while ((cores = benchmark->core_set()))
     {
         mx::tasking::runtime_guard _(false, cores, prefetch_distance);
+        benchmark->start_chronometer();
         benchmark->start();
         //wait_for_continue();
     }
@@ -203,13 +204,13 @@ void Libc::Component::construct(Libc::Env &env) {
     mx::system::Environment::set_cores(&sys_cores);
 
     mx::memory::GlobalHeap::myself();
-    std::uint16_t cores = 64;
+    std::uint16_t cores = 59;
      //env.cpu().affinity_space().total();
 
     char cores_arg[10];
     sprintf(cores_arg, "%d", cores);
 
-    char *args[] = {"blinktree_benchmark", "-i", "20", "--olfit", cores_arg};
+    char *args[] = {"blinktree_benchmark", "-i", "200", "--olfit", cores_arg};
 
     Libc::with_libc([&]()
                     {