[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36351] [PATCH 06/10] derivations: 'derivation' preserves pointer eq
From: |
Ludovic Courtès |
Subject: |
[bug#36351] [PATCH 06/10] derivations: 'derivation' preserves pointer equality. |
Date: |
Mon, 24 Jun 2019 14:22:08 +0200 |
* guix/derivations.scm (derivation): Check if FILE is already in
%DERIVATION-CACHE and return it if it is.
---
guix/derivations.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/guix/derivations.scm b/guix/derivations.scm
index 5c568f223b..403e86749b 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -873,8 +873,12 @@ derivation. It is kept as-is, uninterpreted, in the
derivation."
(append (map derivation-input-path inputs)
sources)))
(drv* (set-field drv (derivation-file-name) file)))
- (hash-set! %derivation-cache file drv*)
- drv*)))
+ ;; Preserve pointer equality. This improves the performance of
+ ;; 'eq?'-memoization on derivations.
+ (or (hash-ref %derivation-cache file)
+ (begin
+ (hash-set! %derivation-cache file drv*)
+ drv*)))))
(define (invalidate-derivation-caches!)
"Invalidate internal derivation caches. This is mostly useful for
--
2.22.0
- [bug#36351] [PATCH 00/10] Add 'derivation-build-plan', improve (guix derivations), Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 01/10] derivations: Add 'derivation-input'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 03/10] ui: 'show-what-to-build' uses 'derivation-build-plan'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 04/10] graph: Use 'derivation-input-derivation'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 06/10] derivations: 'derivation' preserves pointer equality.,
Ludovic Courtès <=
- [bug#36351] [PATCH 07/10] derivations: 'build-derivations' can be passed derivation inputs., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 02/10] derivations: Rewrite and replace 'derivations-prerequisites-to-build'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 10/10] ui: 'show-derivation-outputs' accepts <derivation-input> records., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 08/10] packages: 'specification->package+output' distinguishes "no output specified"., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 09/10] ui: 'show-what-to-build' accepts derivation inputs., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 05/10] derivations: <derivation-input> now aggregates a <derivation>., Ludovic Courtès, 2019/06/24
- bug#36351: [PATCH 00/10] Add 'derivation-build-plan', improve (guix derivations), Ludovic Courtès, 2019/06/27