From c1da694434f7df715d43c0a7c4fcff7ae23d47d8 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Thu, 14 Mar 2024 10:58:46 +0100
Subject: result_map: Be explicit in logging location when getting results...

...by allowing a Logger instance to be provided.
---
 src/buildtool/build_engine/target_map/TARGETS        |  1 +
 src/buildtool/build_engine/target_map/result_map.hpp | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS
index 14bd48a5..70d99908 100644
--- a/src/buildtool/build_engine/target_map/TARGETS
+++ b/src/buildtool/build_engine/target_map/TARGETS
@@ -26,6 +26,7 @@
     , ["@", "gsl", "", "gsl"]
     , ["src/utils/cpp", "hash_combine"]
     , ["src/buildtool/logging", "logging"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/build_engine/base_maps", "entity_name"]
     ]
diff --git a/src/buildtool/build_engine/target_map/result_map.hpp b/src/buildtool/build_engine/target_map/result_map.hpp
index dcc6577e..a4b7272e 100644
--- a/src/buildtool/build_engine/target_map/result_map.hpp
+++ b/src/buildtool/build_engine/target_map/result_map.hpp
@@ -32,6 +32,7 @@
 #include "src/buildtool/build_engine/target_map/configured_target.hpp"
 #include "src/buildtool/common/statistics.hpp"
 #include "src/buildtool/common/tree.hpp"
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/logging/logger.hpp"
 #include "src/buildtool/multithreading/task.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
@@ -171,7 +172,8 @@ class ResultTargetMap {
 
     template <bool kIncludeOrigins = false>
     [[nodiscard]] auto ToResult(gsl::not_null<Statistics const*> const& stats,
-                                gsl::not_null<Progress*> const& progress) const
+                                gsl::not_null<Progress*> const& progress,
+                                Logger const* logger = nullptr) const
         -> ResultType<kIncludeOrigins> {
         ResultType<kIncludeOrigins> result{};
         size_t na = 0;
@@ -302,11 +304,13 @@ class ResultTargetMap {
 
         int trees_traversed = stats->TreesAnalysedCounter();
         if (trees_traversed > 0) {
-            Logger::Log(LogLevel::Performance,
+            Logger::Log(logger,
+                        LogLevel::Performance,
                         "Analysed {} non-known source trees",
                         trees_traversed);
         }
-        Logger::Log(LogLevel::Info,
+        Logger::Log(logger,
+                    LogLevel::Info,
                     "Discovered {} actions, {} trees, {} blobs",
                     result.actions.size(),
                     result.trees.size(),
-- 
cgit v1.2.3