mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-10 05:31:21 +01:00
store: 'mcached' users can specify a cache ID.
Users of 'mcached' can now specify a cache ID; furthermore, the cache hit rate is automatically recorded for all the caches accessed with 'mcached'. * guix/store.scm (%max-store-connection-caches) (%store-connection-cache-names): New variables. (recorder-for-cache): New procedure. (record-cache-lookup!): Add 'cache-id' parameter and rewrite in terms of 'recorder-for-cache'. (lookup-cached-object): Add 'cache-id' parameter and honor it. (%mcached): Add #:cache parameter and honor it. (mcached): Add '=>' keyword and corresponding clauses.
This commit is contained in:
parent
3ae7632ca0
commit
ba6ba1a5af
1 changed files with 53 additions and 12 deletions
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
|
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
|
||||||
|
@ -1793,6 +1793,14 @@ This makes sense only when the daemon was started with '--cache-failures'."
|
||||||
;; the 'caches' vector of <store-connection>.
|
;; the 'caches' vector of <store-connection>.
|
||||||
(define %store-connection-caches (make-atomic-box 0))
|
(define %store-connection-caches (make-atomic-box 0))
|
||||||
|
|
||||||
|
(define %max-store-connection-caches
|
||||||
|
;; Maximum number of caches returned by 'allocate-store-connection-cache'.
|
||||||
|
32)
|
||||||
|
|
||||||
|
(define %store-connection-cache-names
|
||||||
|
;; Mapping of cache ID to symbol.
|
||||||
|
(make-vector %max-store-connection-caches))
|
||||||
|
|
||||||
(define (allocate-store-connection-cache name)
|
(define (allocate-store-connection-cache name)
|
||||||
"Allocate a new cache for store connections and return its identifier. Said
|
"Allocate a new cache for store connections and return its identifier. Said
|
||||||
identifier can be passed as an argument to "
|
identifier can be passed as an argument to "
|
||||||
|
@ -1800,7 +1808,9 @@ identifier can be passed as an argument to "
|
||||||
(let ((previous (atomic-box-compare-and-swap! %store-connection-caches
|
(let ((previous (atomic-box-compare-and-swap! %store-connection-caches
|
||||||
current (+ current 1))))
|
current (+ current 1))))
|
||||||
(if (= previous current)
|
(if (= previous current)
|
||||||
current
|
(begin
|
||||||
|
(vector-set! %store-connection-cache-names current name)
|
||||||
|
current)
|
||||||
(loop current)))))
|
(loop current)))))
|
||||||
|
|
||||||
(define %object-cache-id
|
(define %object-cache-id
|
||||||
|
@ -1926,16 +1936,37 @@ whether the cache lookup was a hit, and the actual cache (a vhash)."
|
||||||
(lambda (x y)
|
(lambda (x y)
|
||||||
#t)))
|
#t)))
|
||||||
|
|
||||||
(define record-cache-lookup!
|
(define recorder-for-cache
|
||||||
(cache-lookup-recorder "object-cache" "Store object cache"))
|
(let ((recorders (make-vector %max-store-connection-caches)))
|
||||||
|
(lambda (cache-id)
|
||||||
|
"Return a procedure to record lookup stats for CACHE-ID."
|
||||||
|
(match (vector-ref recorders cache-id)
|
||||||
|
((? unspecified?)
|
||||||
|
(let* ((name (symbol->string
|
||||||
|
(vector-ref %store-connection-cache-names cache-id)))
|
||||||
|
(description
|
||||||
|
(string-titlecase
|
||||||
|
(string-map (match-lambda
|
||||||
|
(#\- #\space)
|
||||||
|
(chr chr))
|
||||||
|
name))))
|
||||||
|
(let ((proc (cache-lookup-recorder name description)))
|
||||||
|
(vector-set! recorders cache-id proc)
|
||||||
|
proc)))
|
||||||
|
(proc proc)))))
|
||||||
|
|
||||||
(define-inlinable (lookup-cached-object object keys vhash-fold*)
|
(define (record-cache-lookup! cache-id value cache)
|
||||||
"Return the cached object in the store connection corresponding to OBJECT
|
"Record the lookup of VALUE in CACHE-ID, whose current value is CACHE."
|
||||||
|
(let ((record! (recorder-for-cache cache-id)))
|
||||||
|
(record! value cache)))
|
||||||
|
|
||||||
|
(define-inlinable (lookup-cached-object cache-id object keys vhash-fold*)
|
||||||
|
"Return the object in store cache CACHE-ID corresponding to OBJECT
|
||||||
and KEYS; use VHASH-FOLD* to look for OBJECT in the cache. KEYS is a list of
|
and KEYS; use VHASH-FOLD* to look for OBJECT in the cache. KEYS is a list of
|
||||||
additional keys to match against, and which are compared with 'equal?'.
|
additional keys to match against, and which are compared with 'equal?'.
|
||||||
Return #f on failure and the cached result otherwise."
|
Return #f on failure and the cached result otherwise."
|
||||||
(lambda (store)
|
(lambda (store)
|
||||||
(let* ((cache (store-connection-cache store %object-cache-id))
|
(let* ((cache (store-connection-cache store cache-id))
|
||||||
|
|
||||||
;; Escape as soon as we find the result. This avoids traversing
|
;; Escape as soon as we find the result. This avoids traversing
|
||||||
;; the whole vlist chain and significantly reduces the number of
|
;; the whole vlist chain and significantly reduces the number of
|
||||||
|
@ -1949,40 +1980,50 @@ Return #f on failure and the cached result otherwise."
|
||||||
result))))
|
result))))
|
||||||
#f object
|
#f object
|
||||||
cache))))
|
cache))))
|
||||||
(record-cache-lookup! value cache)
|
(record-cache-lookup! cache-id value cache)
|
||||||
(values value store))))
|
(values value store))))
|
||||||
|
|
||||||
(define* (%mcached mthunk object #:optional (keys '())
|
(define* (%mcached mthunk object #:optional (keys '())
|
||||||
#:key
|
#:key
|
||||||
|
(cache %object-cache-id)
|
||||||
(vhash-cons vhash-consq)
|
(vhash-cons vhash-consq)
|
||||||
(vhash-fold* vhash-foldq*))
|
(vhash-fold* vhash-foldq*))
|
||||||
"Bind the monadic value returned by MTHUNK, which supposedly corresponds to
|
"Bind the monadic value returned by MTHUNK, which supposedly corresponds to
|
||||||
OBJECT/KEYS, or return its cached value. Use VHASH-CONS to insert OBJECT into
|
OBJECT/KEYS, or return its cached value. Use VHASH-CONS to insert OBJECT into
|
||||||
the cache, and VHASH-FOLD* to look it up."
|
the cache, and VHASH-FOLD* to look it up."
|
||||||
(mlet %store-monad ((cached (lookup-cached-object object keys
|
(mlet %store-monad ((cached (lookup-cached-object cache object keys
|
||||||
vhash-fold*)))
|
vhash-fold*)))
|
||||||
(if cached
|
(if cached
|
||||||
(return cached)
|
(return cached)
|
||||||
(>>= (mthunk)
|
(>>= (mthunk)
|
||||||
(lambda (result)
|
(lambda (result)
|
||||||
(cache-object-mapping object keys result
|
(cache-object-mapping object keys result
|
||||||
|
#:cache cache
|
||||||
#:vhash-cons vhash-cons))))))
|
#:vhash-cons vhash-cons))))))
|
||||||
|
|
||||||
(define-syntax mcached
|
(define-syntax mcached
|
||||||
(syntax-rules (eq? equal?)
|
(syntax-rules (eq? equal? =>)
|
||||||
"Run MVALUE, which corresponds to OBJECT/KEYS, and cache it; or return the
|
"Run MVALUE, which corresponds to OBJECT/KEYS, and cache it; or return the
|
||||||
value associated with OBJECT/KEYS in the store's object cache if there is
|
value associated with OBJECT/KEYS in the store's object cache if there is
|
||||||
one."
|
one."
|
||||||
((_ eq? mvalue object keys ...)
|
((_ eq? (=> cache) mvalue object keys ...)
|
||||||
(%mcached (lambda () mvalue)
|
(%mcached (lambda () mvalue)
|
||||||
object (list keys ...)
|
object (list keys ...)
|
||||||
|
#:cache cache
|
||||||
#:vhash-cons vhash-consq
|
#:vhash-cons vhash-consq
|
||||||
#:vhash-fold* vhash-foldq*))
|
#:vhash-fold* vhash-foldq*))
|
||||||
((_ equal? mvalue object keys ...)
|
((_ equal? (=> cache) mvalue object keys ...)
|
||||||
(%mcached (lambda () mvalue)
|
(%mcached (lambda () mvalue)
|
||||||
object (list keys ...)
|
object (list keys ...)
|
||||||
|
#:cache cache
|
||||||
#:vhash-cons vhash-cons
|
#:vhash-cons vhash-cons
|
||||||
#:vhash-fold* vhash-fold*))
|
#:vhash-fold* vhash-fold*))
|
||||||
|
((_ eq? mvalue object keys ...)
|
||||||
|
(mcached eq? (=> %object-cache-id)
|
||||||
|
mvalue object keys ...))
|
||||||
|
((_ equal? mvalue object keys ...)
|
||||||
|
(mcached equal? (=> %object-cache-id)
|
||||||
|
mvalue object keys ...))
|
||||||
((_ mvalue object keys ...)
|
((_ mvalue object keys ...)
|
||||||
(mcached eq? mvalue object keys ...))))
|
(mcached eq? mvalue object keys ...))))
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue