From 40cc850aebb497faed0a11d867d8fcee729023df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Jun 2017 23:09:39 +0200 Subject: download: 'built-in-builders*' relies on the functional cache. The previous caching strategy, which used STORE as an 'eq?' key, would no longer work when the functional cache is used because subsequent store values are not 'eq?'. * guix/download.scm (built-in-builders*): Rewrite in terms of 'mcached'. --- guix/download.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'guix') diff --git a/guix/download.scm b/guix/download.scm index a7f51b1999..25eaefcffa 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -411,17 +411,11 @@ (object->string %content-addressed-mirrors))) (define built-in-builders* - (let ((cache (make-weak-key-hash-table))) + (let ((proc (store-lift built-in-builders))) (lambda () "Return, as a monadic value, the list of built-in builders supported by -the daemon." - (lambda (store) - ;; Memoize the result to avoid repeated RPCs. - (values (or (hashq-ref cache store) - (let ((result (built-in-builders store))) - (hashq-set! cache store result) - result)) - store))))) +the daemon; cache the return value." + (mcached (proc) built-in-builders)))) (define* (built-in-download file-name url #:key system hash-algo hash -- cgit v1.2.3