me
/
guix
Archived
1
0
Fork 0
Code

store: 'references/cached' now uses a per-session cache. 

* guix/store.scm (%reference-cache): Remove.
(%reference-cache-id): New variable.
(references/cached): Rewrite in terms of it.
master
Ludovic Courtès 2021-05-31 22:38:03 +02:00
parent 2725f04634
commit fde3c349f5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
guix/store.scm
View File

@ -1476,21 +1476,6 @@ error if there is no such root."
"Return the list of references of PATH." "Return the list of references of PATH."
store-path-list)) 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 (define* (fold-path store proc seed paths
#:optional (relatives (cut references store <>))) #:optional (relatives (cut references store <>)))
"Call PROC for each of the RELATIVES of PATHS, exactly once, and return the "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." 'set-store-connection-cache' instead, together with using %STORE-MONAD."
(vector-set! (store-connection-caches store) cache value)) (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. ;;; Store monad.