From 24420f5ffabfbdbe913a5765e5c00e17de18fb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 2 Jul 2018 22:15:35 +0200 Subject: packages: Optimize 'package-transitive-supported-systems'. This version is 13% faster than the one above when timing: (fold-packages (lambda (p x) (package-transitive-supported-systems p)) '()) * guix/packages.scm (package-transitive-supported-systems): Make 'systems' a set instead of calling 'lset-intersection' repeatedly. --- guix/packages.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'guix/packages.scm') diff --git a/guix/packages.scm b/guix/packages.scm index c762fa7c39..cd7d3b895c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -766,15 +766,16 @@ in INPUTS and their transitive propagated inputs." (mlambdaq (package) "Return the intersection of the systems supported by PACKAGE and those supported by its dependencies." - (fold (lambda (input systems) - (match input - ((label (? package? p) . _) - (lset-intersection - string=? systems (package-transitive-supported-systems p))) - (_ - systems))) - (package-supported-systems package) - (bag-direct-inputs (package->bag package))))) + (set->list + (fold (lambda (input systems) + (match input + ((label (? package? p) . _) + (fold set-insert systems + (package-transitive-supported-systems p))) + (_ + systems))) + (list->set (package-supported-systems package)) + (bag-direct-inputs (package->bag package)))))) (define* (supported-package? package #:optional (system (%current-system))) "Return true if PACKAGE is supported on SYSTEM--i.e., if PACKAGE and all its -- cgit v1.2.3