diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-12-10 11:39:01 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-12-10 16:25:00 +0100 |
| commit | fe6939e9ef24ab52eb57c745eb106204c1acc576 (patch) | |
| tree | 4649433005c1355c81ad83889ae244bad698f81c /src/buildtool/computed_roots/evaluate.cpp | |
| parent | d2c178ddb14fb0ba0a9518e39fafbdcad19715ed (diff) | |
| download | justbuild-fe6939e9ef24ab52eb57c745eb106204c1acc576.tar.gz | |
Computed Roots: be aware of the serve end point
... as the base repository of a computed root might be absent.
Diffstat (limited to 'src/buildtool/computed_roots/evaluate.cpp')
| -rw-r--r-- | src/buildtool/computed_roots/evaluate.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/buildtool/computed_roots/evaluate.cpp b/src/buildtool/computed_roots/evaluate.cpp index 4325fb48..6bb40ee8 100644 --- a/src/buildtool/computed_roots/evaluate.cpp +++ b/src/buildtool/computed_roots/evaluate.cpp @@ -266,6 +266,7 @@ void ComputeAndFill( gsl::not_null<RepositoryConfig*> const& repository_config, gsl::not_null<const GraphTraverser::CommandLineArguments*> const& traverser_args, + ServeApi const* serve, gsl::not_null<const ExecutionContext*> const& context, gsl::not_null<const StorageConfig*> const& storage_config, gsl::not_null<std::optional<RehashUtils::Rehasher>*> const& rehash, @@ -292,7 +293,8 @@ void ComputeAndFill( AnalyseContext analyse_context{.repo_config = repository_config, .storage = &storage, .statistics = &statistics, - .progress = &progress}; + .progress = &progress, + .serve = serve}; Logger build_logger = Logger( target.ToString(), std::vector<LogSinkFactory>{LogSinkFile::CreateFactory(log_file)}); @@ -411,6 +413,7 @@ auto FillRoots( gsl::not_null<const GraphTraverser::CommandLineArguments*> const& traverser_args, gsl::not_null<const ExecutionContext*> const& context, + ServeApi const* serve, gsl::not_null<const StorageConfig*> const& storage_config, gsl::not_null<std::optional<RehashUtils::Rehasher>*> const& rehash, gsl::not_null<std::shared_mutex*> const& config_lock, @@ -419,6 +422,7 @@ auto FillRoots( rehash, repository_config, traverser_args, + serve, context, config_lock, git_lock, @@ -440,6 +444,7 @@ auto FillRoots( repository_config, traverser_args, context, + serve, storage_config, config_lock, rehash, @@ -450,6 +455,7 @@ auto FillRoots( ComputeAndFill(key, repository_config, traverser_args, + serve, context, storage_config, rehash, @@ -469,6 +475,7 @@ auto FillRoots( auto EvaluateComputedRoots( gsl::not_null<RepositoryConfig*> const& repository_config, std::string const& main_repo, + ServeApi const* serve, StorageConfig const& storage_config, std::optional<StorageConfig> const& git_storage_config, GraphTraverser::CommandLineArguments const& traverser_args, @@ -516,6 +523,7 @@ auto EvaluateComputedRoots( repository_config, &traverser_args, context, + serve, &storage_config, &rehash, &repo_config_access, |