From 1d9d40b2a663464f1e6800d6de8df61433507423 Mon Sep 17 00:00:00 2001
From: eldritch horrors <pennae@lix.systems>
Date: Sun, 20 Oct 2024 22:55:00 +0200
Subject: libstore: move failingExitStatus into worker results

we already have a results type for the entire worker call, we may as
well put this bit of info in there. we do keep the assumption of the
old code that the field will only be read if some goals have failed;
fixing that is a very different mess, and not immediately necessary.

Change-Id: If3fc32649dcd88e1987cdd1758c6c5743e3b35ac
---
 src/libstore/build/worker.cc | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'src/libstore/build/worker.cc')

diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc
index 10f58f5d3..33bee1019 100644
--- a/src/libstore/build/worker.cc
+++ b/src/libstore/build/worker.cc
@@ -270,7 +270,7 @@ try {
     while (auto done = co_await collect.next()) {
         // propagate goal exceptions outward
         BOOST_OUTCOME_CO_TRY(auto result, done->second);
-        results.emplace(done->first, result);
+        results.goals.emplace(done->first, result);
 
         /* If a top-level goal failed, then kill all other goals
            (unless keepGoing was set). */
@@ -285,6 +285,25 @@ try {
        --keep-going *is* set, then they must all be finished now. */
     assert(!settings.keepGoing || children.isEmpty());
 
+    results.failingExitStatus = [&] {
+        // See API docs in header for explanation
+        unsigned int mask = 0;
+        bool buildFailure = permanentFailure || timedOut || hashMismatch;
+        if (buildFailure)
+            mask |= 0x04;  // 100
+        if (timedOut)
+            mask |= 0x01;  // 101
+        if (hashMismatch)
+            mask |= 0x02;  // 102
+        if (checkMismatch) {
+            mask |= 0x08;  // 104
+        }
+
+        if (mask)
+            mask |= 0x60;
+        return mask ? mask : 1;
+    }();
+
     co_return std::move(results);
 } catch (...) {
     co_return result::failure(std::current_exception());
@@ -301,27 +320,6 @@ try {
 }
 
 
-unsigned int Worker::failingExitStatus()
-{
-    // See API docs in header for explanation
-    unsigned int mask = 0;
-    bool buildFailure = permanentFailure || timedOut || hashMismatch;
-    if (buildFailure)
-        mask |= 0x04;  // 100
-    if (timedOut)
-        mask |= 0x01;  // 101
-    if (hashMismatch)
-        mask |= 0x02;  // 102
-    if (checkMismatch) {
-        mask |= 0x08;  // 104
-    }
-
-    if (mask)
-        mask |= 0x60;
-    return mask ? mask : 1;
-}
-
-
 bool Worker::pathContentsGood(const StorePath & path)
 {
     auto i = pathContentsGoodCache.find(path);
-- 
cgit v1.2.3