me
/
guix
Archived
1
0
Fork 0
Code

offload: Delay call to 'read-derivation-from-file'. 

This significantly reduces the amount of work done by "guix offload"
when there's no machine to offload to.

* guix/scripts/offload.scm (process-request): Add call to
'read-derivation-from-file', moved from...
(guix-offload): ... here.
master
Ludovic Courtès 2021-12-15 12:33:28 +01:00
parent 616dc4397f
commit ebbf7fc1c6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/scripts/offload.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014-2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
@ -584,7 +584,8 @@ If TIMEOUT is #f, simply evaluate EXP..."
(lambda () (lambda ()
;; Offload DRV to MACHINE. ;; Offload DRV to MACHINE.
(display "# accept\n") (display "# accept\n")
(let ((inputs (string-tokenize (read-line))) (let ((drv (read-derivation-from-file drv))
(inputs (string-tokenize (read-line)))
(outputs (string-tokenize (read-line)))) (outputs (string-tokenize (read-line))))
;; Even if BUILD-TIMEOUT is honored by MACHINE, there can ;; Even if BUILD-TIMEOUT is honored by MACHINE, there can
;; be issues with the connection or deadlocks that could ;; be issues with the connection or deadlocks that could
@ -803,8 +804,7 @@ machine."
(with-error-handling (with-error-handling
(process-request (equal? (match:substring match 1) "1") (process-request (equal? (match:substring match 1) "1")
(match:substring match 2) ; system (match:substring match 2) ; system
(read-derivation-from-file (match:substring match 3)
(match:substring match 3))
(string-tokenize (string-tokenize
(match:substring match 4) not-coma) (match:substring match 4) not-coma)
#:print-build-trace? print-build-trace? #:print-build-trace? print-build-trace?