From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mJ1oIE6GuGBvVgAAgWs5BA (envelope-from ) for ; Thu, 03 Jun 2021 09:35:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +EWSG06GuGA9CwAA1q6Kng (envelope-from ) for ; Thu, 03 Jun 2021 07:35:42 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 40D78217FE for ; Thu, 3 Jun 2021 09:35:42 +0200 (CEST) Received: from localhost ([::1]:47692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lohtF-0005Z1-Bv for larch@yhetil.org; Thu, 03 Jun 2021 03:35:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lohse-0004hL-W6 for guix-patches@gnu.org; Thu, 03 Jun 2021 03:35:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lohse-0001wZ-M6 for guix-patches@gnu.org; Thu, 03 Jun 2021 03:35:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lohse-0001X5-Jb for guix-patches@gnu.org; Thu, 03 Jun 2021 03:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48806] [PATCH 6/7] store: 'references/cached' now uses a per-session cache. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 07:35:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48806@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 48806-submit@debbugs.gnu.org id=B48806.16227056895816 (code B ref 48806); Thu, 03 Jun 2021 07:35:04 +0000 Received: (at 48806) by debbugs.gnu.org; 3 Jun 2021 07:34:49 +0000 Received: from localhost ([127.0.0.1]:42019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lohsP-0001Vf-A8 for submit@debbugs.gnu.org; Thu, 03 Jun 2021 03:34:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lohsN-0001UX-FT for 48806@debbugs.gnu.org; Thu, 03 Jun 2021 03:34:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60218) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lohsI-0001Zu-9F; Thu, 03 Jun 2021 03:34:42 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57488 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lohsG-0005sA-GO; Thu, 03 Jun 2021 03:34:41 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 3 Jun 2021 09:34:00 +0200 Message-Id: <20210603073401.13629-6-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210603073401.13629-1-ludo@gnu.org> References: <20210603073401.13629-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622705742; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=6/IjWEKJNRazmmZjVwDPgpXSjkCQxZs7oVEdzI4Kpeo=; b=XfV8uNjnqX6nrJIDTCF9KSQYerlLOa3YU05AZPGZUHhkkoyUJvl/x35OzqHNIbGgwl7trk 1dPINRav7wB7hGfVxd8mzTdfWeshzMS+p+2nXJkM810W6RuDMSaIeqSya7MUhNbwkMKS30 tIrGOIW2hnlraMxxi4e6uwyC/wNYIoesGl5IlA0Q4L00/lMoBA4CGvPtEBLRKE4nGcn89+ y0Ies4d06XXSoQ/WM6ZjMlwT+zMkBJK0qiuA0KqOHVDqPWQ5DGHoUsJBgFclHjW8/z3cGX bzXks/tU3SZmmLLdQh86+T2zzNQD2Wjx4DsX1u79g0ZGjVMWmbcr9JUrG0UCRw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622705742; a=rsa-sha256; cv=none; b=s3ebHt3mLf39kU0pRWkRTzo6Eoh1/clX+Pdt8v2IVIlkLzTdawB7qnPuNfZlF6IXSku0jP muIsORxmsXx1S1RAr53PAuAUq1oHbJ4cgV+XPcNPBRwSQIWwV61jIhCzKr/ITXmjTbcAOO HbPkEgSJ3fJBhXOQdCAS3EqObPORZDoMEL9goH2GQubFod8BufSgjtqpIOh2RvhxjJ2fDO Ovln+dobAJ5CwMoYRWn+YlidjK9F3E1uFZJhjpKtJ3OgAZ7AAYqH2sxl9m4TZwF8fPIeID pMOgy3ApmtlQQvpgJ5sZbtfF32oEeomNo40xqdAuadYypXAYnjxA56rstgOWBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.07 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 40D78217FE X-Spam-Score: 2.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: 1YE6a+3AajEJ * guix/store.scm (%reference-cache): Remove. (%reference-cache-id): New variable. (references/cached): Rewrite in terms of it. --- guix/store.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/guix/store.scm b/guix/store.scm index ea784a33d2..b761264ac0 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1476,21 +1476,6 @@ error if there is no such root." "Return the list of references of PATH." store-path-list)) -(define %reference-cache - ;; Brute-force cache mapping store items to their list of references. - ;; Caching matters because when building a profile in the presence of - ;; grafts, we keep calling 'graft-derivation', which in turn calls - ;; 'references/cached' many times with the same arguments. Ideally we - ;; would use a cache associated with the daemon connection instead (XXX). - (make-hash-table 100)) - -(define (references/cached store item) - "Like 'references', but cache results." - (or (hash-ref %reference-cache item) - (let ((references (references store item))) - (hash-set! %reference-cache item references) - references))) - (define* (fold-path store proc seed paths #:optional (relatives (cut references store <>))) "Call PROC for each of the RELATIVES of PATHS, exactly once, and return the @@ -1810,6 +1795,26 @@ This is a mutating version that should be avoided. Prefer the functional 'set-store-connection-cache' instead, together with using %STORE-MONAD." (vector-set! (store-connection-caches store) cache value)) + +(define %reference-cache-id + ;; Cache mapping store items to their list of references. Caching matters + ;; because when building a profile in the presence of grafts, we keep + ;; calling 'graft-derivation', which in turn calls 'references/cached' many + ;; times with the same arguments. + (allocate-store-connection-cache 'reference-cache)) + +(define (references/cached store item) + "Like 'references', but cache results." + (let ((cache (store-connection-cache store %reference-cache-id))) + (match (vhash-assoc item cache) + ((_ . references) + references) + (#f + (let* ((references (references store item)) + (cache (vhash-cons item references cache))) + (set-store-connection-cache! store %reference-cache-id cache) + references))))) + ;;; ;;; Store monad. -- 2.31.1