From patchwork Mon Jan 25 13:37:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 26630 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8C7F327BC1C; Mon, 25 Jan 2021 13:39:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 31FFC27BC1B for ; Mon, 25 Jan 2021 13:39:15 +0000 (GMT) Received: from localhost ([::1]:48070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l425K-0001Pq-CM for patchwork@mira.cbaines.net; Mon, 25 Jan 2021 08:39:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4257-0001Og-Rw for guix-patches@gnu.org; Mon, 25 Jan 2021 08:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54942) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4257-0004xw-L0 for guix-patches@gnu.org; Mon, 25 Jan 2021 08:39:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4257-0001y3-Gt for guix-patches@gnu.org; Mon, 25 Jan 2021 08:39:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46101] [PATCH 3/4] inferior: Memoize inferior package search path access. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jan 2021 13:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46101 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46100@debbugs.gnu.org, 46101@debbugs.gnu.org X-Debbugs-Original-To: 46100@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16115818887474 (code B ref -1); Mon, 25 Jan 2021 13:39:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jan 2021 13:38:08 +0000 Received: from localhost ([127.0.0.1]:38249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l424G-0001wS-Av for submit@debbugs.gnu.org; Mon, 25 Jan 2021 08:38:08 -0500 Received: from lists.gnu.org ([209.51.188.17]:40624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l424A-0001vB-T0 for submit@debbugs.gnu.org; Mon, 25 Jan 2021 08:38:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l424A-0000YK-JW for guix-patches@gnu.org; Mon, 25 Jan 2021 08:38:02 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4247-0004Vt-Pv for guix-patches@gnu.org; Mon, 25 Jan 2021 08:38:02 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1611581875; cv=none; d=zohomail.com; s=zohoarc; b=nc5AEciNdvs5xK5c/8lNVw11qA3/5PngPAHJ5iX2tXe/BreS2ZsvCyWScBFgAxJVN50PMFZ1p9sqdOv2sbDtSvbNWj+Y90sM3SmdjmOtG7+ZtfNcdjSIBmzyjiIKhs6dEGeAJIyaeQquA/Dzs6eBkRZcG7N+ovM8NAzFnzw+uQc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611581875; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=OA/Bh6Hl4/PIxHtpZEs7jz/FNcsenzfolLCuCE5k+fc=; b=G1epHyWLJZKlmbwzhEVuVrbrMyVBRmBuzCulXbkOKGZzIkiRpzfawdRe18C5uUIDiNhd6hd/giGZI8kEZ9kmS3qy2TBwG8LFhl+vfIm3GfCtbr2JreGyq54RaUvWHzSX8kdbM65x7G1xacqePDQi9DwH+qArtzeITMi2EDmq4cY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1611581875; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=OA/Bh6Hl4/PIxHtpZEs7jz/FNcsenzfolLCuCE5k+fc=; b=aONhdJKjKSx/RTR1Q41r8hEx87V8xund1kLxPJiwpiK+3zVAX5gLSfNwAbtJkPaF R3GQTJd5AYcYtPpMnMKPjNdp9jziVd9RerN4afLLrGRT7DGJNB2928EKATLE48gxXzk zKgKw32g4ekBeTpU9J5tAoltOic7T8jNquNljNAs= Received: from localhost (p54ad4ec7.dip0.t-ipconnect.de [84.173.78.199]) by mx.zohomail.com with SMTPS id 1611581873054657.0029672331033; Mon, 25 Jan 2021 05:37:53 -0800 (PST) From: Ricardo Wurmus Message-ID: <20210125133738.15609-3-rekado@elephly.net> Date: Mon, 25 Jan 2021 14:37:37 +0100 X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210125133738.15609-1-rekado@elephly.net> References: <20210125133738.15609-1-rekado@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.51; envelope-from=rekado@elephly.net; helo=sender4-of-o51.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/inferior.scm (%inferior-package-search-paths): Return memoized procedure accepting a package. (inferior-package-native-search-paths, inferior-package-search-paths, inferior-package-transitive-native-search-paths): Adapt. --- guix/inferior.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 7bfce5d810..0c85a9ea08 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -45,6 +45,7 @@ #:use-module (guix store) #:use-module (guix derivations) #:use-module (guix base32) + #:use-module ((guix memoization) #:select (mlambdaq)) #:use-module (gcrypt hash) #:autoload (guix cache) (maybe-remove-expired-cache-entries file-expiration-time) @@ -430,27 +431,28 @@ inferior package." (define inferior-package-transitive-propagated-inputs (cut inferior-package-input-field <> 'package-transitive-propagated-inputs)) -(define (%inferior-package-search-paths package field) +(define (%inferior-package-search-paths field) "Return the list of search path specifications of PACKAGE, an inferior package." - (define paths - (inferior-package-field package - `(compose (lambda (paths) - (map (@ (guix search-paths) - search-path-specification->sexp) - paths)) - ,field))) + (mlambdaq (package) + (define paths + (inferior-package-field package + `(compose (lambda (paths) + (map (@ (guix search-paths) + search-path-specification->sexp) + paths)) + ,field))) - (map sexp->search-path-specification paths)) + (map sexp->search-path-specification paths))) (define inferior-package-native-search-paths - (cut %inferior-package-search-paths <> 'package-native-search-paths)) + (%inferior-package-search-paths 'package-native-search-paths)) (define inferior-package-search-paths - (cut %inferior-package-search-paths <> 'package-search-paths)) + (%inferior-package-search-paths 'package-search-paths)) (define inferior-package-transitive-native-search-paths - (cut %inferior-package-search-paths <> 'package-transitive-native-search-paths)) + (%inferior-package-search-paths 'package-transitive-native-search-paths)) (define (inferior-package-provenance package) "Return a \"provenance sexp\" for PACKAGE, an inferior package. The result