Handle multiple values in call-with-time-logging

1 files changed, 12 insertions, 10 deletions

diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm
index b672a9b..6a69c94 100644
--- a/guix-build-coordinator/utils.scm
+++ b/guix-build-coordinator/utils.scm
@@ -508,16 +508,18 @@ References: ~a~%"
       #t)))
 
 (define (call-with-time-logging name thunk)
-  (let* ((start   (current-time time-utc))
-         (result  (thunk))
-         (end     (current-time time-utc))
-         (elapsed (time-difference end start)))
-    (format (current-output-port)
-            "~a took ~a seconds~%"
-            name
-            (+ (time-second elapsed)
-               (/ (time-nanosecond elapsed) 1e9)))
-    result))
+  (let ((start   (current-time time-utc)))
+    (call-with-values
+        thunk
+      (lambda vals
+        (let* ((end     (current-time time-utc))
+               (elapsed (time-difference end start)))
+          (format (current-output-port)
+                  "~a took ~a seconds~%"
+                  name
+                  (+ (time-second elapsed)
+                     (/ (time-nanosecond elapsed) 1e9)))
+          (apply values vals))))))
 
 (define-syntax-rule (with-time-logging name exp ...)
   "Log under NAME the time taken to evaluate EXP."