From 40f154c0edc53e160b70fc60b2b5b8652dfbe84b Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sat, 5 Oct 2024 00:38:35 +0200 Subject: libstore: remove Worker::topGoals since we now propagate goal exceptions properly we no longer need to check topGoals for a reason to abort early. any early abort reasons, whether by exception or a clean top goal failure, can now be handled by inspecting the goal result in the main loop. this greatly reduces goal-to-goal interactions that do not happen at the main loop level. since the underscore-free name is now available for use as variables we'll migrate to that where we currently use `_topGoals` for locals. Change-Id: I5727c5ea7799647c0a69ab76975b1a03a6558aa6 --- src/libstore/build/worker.hh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/libstore/build/worker.hh') diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh index 26832c3b1..fa1031907 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/build/worker.hh @@ -91,11 +91,6 @@ private: bool running = false; - /** - * The top-level goals of the worker. - */ - Goals topGoals; - template struct CachedGoal { @@ -172,7 +167,7 @@ private: statisticsUpdateInhibitor = {}; } - kj::Promise> runImpl(Targets _topGoals); + kj::Promise> runImpl(Targets topGoals); kj::Promise> boopGC(LocalStore & localStore); public: -- cgit v1.2.3