diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-04-18 13:19:10 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-04-19 10:08:29 +0200 |
| commit | 481c89631440a7593e1fb353d6902e756ac1ce00 (patch) | |
| tree | 5c171126286b99a43d3f0d654c2f52f4bf6469ea /src | |
| parent | c36b157f5f65c6381864b670ea826aad705aa6a8 (diff) | |
| download | justbuild-481c89631440a7593e1fb353d6902e756ac1ce00.tar.gz | |
Export progress: report short configuration
As we always analyse export targets in their canonical configuration (and
do count in the progress the mapping from obtained configuraiton
to canonical one), the shortend name (i.e., the representation
with null values dropped form the configuration) is still a unique
representation of the target. Use this in progress reporting to
simplify reading the progress sample.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtool/build_engine/target_map/TARGETS | 1 | ||||
| -rw-r--r-- | src/buildtool/build_engine/target_map/export.cpp | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS index 6964f19e..17b5b2df 100644 --- a/src/buildtool/build_engine/target_map/TARGETS +++ b/src/buildtool/build_engine/target_map/TARGETS @@ -67,6 +67,7 @@ , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "hash_combine"] + , ["src/utils/cpp", "json"] , ["src/utils/cpp", "path"] , ["src/utils/cpp", "path_hash"] , ["src/utils/cpp", "vector"] diff --git a/src/buildtool/build_engine/target_map/export.cpp b/src/buildtool/build_engine/target_map/export.cpp index 7142bfa8..e0bc36c3 100644 --- a/src/buildtool/build_engine/target_map/export.cpp +++ b/src/buildtool/build_engine/target_map/export.cpp @@ -17,12 +17,14 @@ #include <unordered_set> #include <utility> // std::move +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/field_reader.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" +#include "src/utils/cpp/json.hpp" #ifndef BOOTSTRAP_BUILD_TOOL #include "src/buildtool/serve_api/remote/config.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" @@ -144,8 +146,10 @@ void ExportRule( Logger::Log(LogLevel::Debug, "Querying serve endpoint for export target {}", key.target.ToString()); - auto task = fmt::format( - "[{},{}]", key.target.ToString(), effective_config.ToString()); + auto task = + fmt::format("[{},{}]", + key.target.ToString(), + PruneJson(effective_config.ToJson()).dump()); exports_progress->TaskTracker().Start(task); auto res = ServeApi::ServeTarget(*target_cache_key, *repo_key); // process response from serve endpoint |