[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/17: gexp: Optimize 'with-build-variables'.
From: |
guix-commits |
Subject: |
02/17: gexp: Optimize 'with-build-variables'. |
Date: |
Mon, 22 Mar 2021 18:02:36 -0400 (EDT) |
civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit f8167d828bfc63ace143aa87e2aecae641a8e94c
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Feb 28 18:22:11 2021 +0100
gexp: Optimize 'with-build-variables'.
* guix/gexp.scm (input-tuples->gexp, outputs->gexp): New procedures.
(with-build-variables): Use it.
---
guix/gexp.scm | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 41 insertions(+), 9 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 6bdc7ba..3817bdd 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1787,6 +1787,43 @@ are searched for in PATH. Return #f when MODULES and
EXTENSIONS are empty."
extensions))
%load-compiled-path)))))))))
+(define* (input-tuples->gexp inputs #:key native?)
+ "Given INPUTS, a list of label/gexp-input tuples, return a gexp that expands
+to an input alist."
+ (define references
+ (map (match-lambda
+ ((label input) input))
+ inputs))
+
+ (define labels
+ (match inputs
+ (((labels . _) ...)
+ labels)))
+
+ (define (proc . args)
+ (cons 'quote (list (map cons labels args))))
+
+ ;; This gexp is more efficient than an equivalent hand-written gexp: fewer
+ ;; allocations, no need to scan long list-valued <gexp-input> records in
+ ;; search of file-like objects, etc.
+ (make-gexp references '() '() proc
+ (source-properties inputs)))
+
+(define (outputs->gexp outputs)
+ "Given OUTPUTS, a list of output names, return a gexp that expands to an
+output alist."
+ (define references
+ (map gexp-output outputs))
+
+ (define (proc . args)
+ `(list ,@(map (lambda (name)
+ `(cons ,name ((@ (guile) getenv) ,name)))
+ outputs)))
+
+ ;; This gexp is more efficient than an equivalent hand-written gexp.
+ (make-gexp references '() '() proc
+ (source-properties outputs)))
+
(define (with-build-variables inputs outputs body)
"Return a gexp that surrounds BODY with a definition of the legacy
'%build-inputs', '%outputs', and '%output' variables based on INPUTS, a list
@@ -1798,17 +1835,12 @@ of name/gexp-input tuples, and OUTPUTS, a list of
strings."
;; expected.
(gexp (begin
(define %build-inputs
- (map (lambda (tuple)
- (apply cons tuple))
- '(ungexp inputs)))
+ (ungexp (input-tuples->gexp inputs)))
(define %outputs
- (list (ungexp-splicing
- (map (lambda (name)
- (gexp (cons (ungexp name)
- (ungexp output name))))
- outputs))))
- (define %output
+ (ungexp (outputs->gexp outputs)))
+ (define %output
(assoc-ref %outputs "out"))
+
(ungexp body))))
(define* (gexp->script name exp
- branch wip-build-systems-gexp created (now 082df93), guix-commits, 2021/03/22
- 01/17: gexp: Add 'with-build-variables'., guix-commits, 2021/03/22
- 03/17: build-system: Rewrite using gexps., guix-commits, 2021/03/22
- 04/17: packages: Turn 'bag->derivation' into a monadic procedure., guix-commits, 2021/03/22
- 05/17: packages: Simplify patch instantiation., guix-commits, 2021/03/22
- 02/17: gexp: Optimize 'with-build-variables'.,
guix-commits <=
- 07/17: packages: Default origin 'patch-flags' is a gexp., guix-commits, 2021/03/22
- 12/17: packages: 'expand-input' accepts any file-like object., guix-commits, 2021/03/22
- 13/17: packages: Call 'bag-grafts' only on the tip of the package graph., guix-commits, 2021/03/22
- 06/17: packages: Core procedures are written in monadic style., guix-commits, 2021/03/22
- 08/17: gexp: Add 'sexp->gexp'., guix-commits, 2021/03/22
- 16/17: gexp: Do not add derivations to the object cache., guix-commits, 2021/03/22
- 17/17: gnu: docbook-xsl: Move 'use-modules' form to the top level., guix-commits, 2021/03/22
- 10/17: build-system: Use 'input-tuples->gexp' and 'outputs->gexp'., guix-commits, 2021/03/22
- 09/17: build-system: Use 'sexp->gexp' for plain sexps., guix-commits, 2021/03/22
- 11/17: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'., guix-commits, 2021/03/22