From 9acac9f9c6452cd76a21e52c7e5a33e8384b82b4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Jun 2020 14:51:02 +0200 Subject: profiles: Fix pathological performance of 'manifest-transitive-entries'. For packages with lots of propagated inputs, 'manifest-transitive-entries', as called from 'check-for-collisions', would exhibit pathological behavior. For example, "guix install cl-ana" wouldn't complete in 1mn; now, it's down to 20s. The issue was that manifest entries would never be 'equal?' due to the delayed field in . * guix/profiles.scm (manifest-transitive-entries): Use a vhash instead of a set. Use 'manifest-entry=?' instead of 'equal?' when checking for equality. --- guix/profiles.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'guix') diff --git a/guix/profiles.scm b/guix/profiles.scm index 25ff146bdf..6064820b9a 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -41,7 +41,6 @@ (define-module (guix profiles) #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix store) - #:use-module (guix sets) #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:use-module (ice-9 regex) @@ -260,17 +259,17 @@ (define (manifest-transitive-entries manifest) recursively." (let loop ((entries (manifest-entries manifest)) (result '()) - (visited (set))) ;compare with 'equal?' + (visited vlist-null)) ;compare with 'manifest-entry=?' (match entries (() (reverse result)) ((head . tail) - (if (set-contains? visited head) + (if (vhash-assoc head visited manifest-entry=?) (loop tail result visited) (loop (append (manifest-entry-dependencies head) tail) (cons head result) - (set-insert head visited))))))) + (vhash-cons head #t visited))))))) (define (profile-manifest profile) "Return the PROFILE's manifest." -- cgit v1.2.3