more resolve comments

Signed-off-by: Martijn Govers <[email protected]>

Author: mgovers

power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp

@@ -17,13 +17,13 @@ using Duration = std::chrono::duration<double>;
 
 class Timer {
   private:
-    Logger* info_;
+    Logger* log_;
     LogEvent code_;
     Clock::time_point start_;
 
   public:
-    Timer() : info_{nullptr}, code_{LogEvent::unknown} {};
-    Timer(Logger& info, LogEvent code) : info_{&info}, code_{code}, start_{Clock::now()} {}
+    Timer() : log_{nullptr}, code_{LogEvent::unknown} {};
+    Timer(Logger& log, LogEvent code) : log_{&log}, code_{code}, start_{Clock::now()} {}
 
     Timer(Timer const&) = delete;
     Timer(Timer&&) = default;
@@ -34,29 +34,29 @@ class Timer {
         stop();
 
         // Copy/move members
-        info_ = timer.info_;
+        log_ = timer.log_;
         code_ = timer.code_;
         start_ = timer.start_;
 
         // Disable original timer
-        timer.info_ = nullptr;
+        timer.log_ = nullptr;
 
         // Return reference
         return *this;
     }
 
     ~Timer() {
-        if (info_ != nullptr) {
+        if (log_ != nullptr) {
             stop();
         }
     }
 
     void stop() {
-        if (info_ != nullptr) {
+        if (log_ != nullptr) {
             auto const now = Clock::now();
             auto const duration = Duration(now - start_);
-            info_->log(code_, duration.count());
-            info_ = nullptr;
+            log_->log(code_, duration.count());
+            log_ = nullptr;
         }
     }
 };

power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp

@@ -159,7 +159,7 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
           math_solver_dispatcher_{&math_solver_dispatcher} {}
 
     MainModelImpl(MainModelImpl const& other)
-        : log_{nullptr}, // calculation info should not be copied, because it may result in race conditions
+        : log_{nullptr}, // logger should not be copied, because it may result in race conditions
           system_frequency_{other.system_frequency_},
           meta_data_{other.meta_data_},
           math_solver_dispatcher_{other.math_solver_dispatcher_},
@@ -183,7 +183,7 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
     }
     MainModelImpl& operator=(MainModelImpl const& other) {
         if (this != &other) {
-            log_ = nullptr; // calculation info should be reset, because it may result in race conditions
+            log_ = nullptr; // logger should be reset, because it may result in race conditions
             system_frequency_ = other.system_frequency_;
             meta_data_ = other.meta_data_;
             math_solver_dispatcher_ = other.math_solver_dispatcher_;

tests/cpp_unit_tests/test_job_dispatch.cpp

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <power_grid_model/batch_parameter.hpp>
-#include <power_grid_model/common/calculation_info.hpp>
+#include <power_grid_model/common/multi_threaded_logging.hpp>
 #include <power_grid_model/common/common.hpp>
 #include <power_grid_model/common/exception.hpp>
 #include <power_grid_model/job_dispatch.hpp>