me
/
guix
Archived
1
0
Fork 0
Code

store: Speed up 'add-to-store'. 

* guix/store.scm (add-to-store): Remove 'lstat' call.
master
Ludovic Courtès 2017-06-12 15:38:49 +02:00 committed by Ludovic Courtès
parent 1243aaac73
commit b46712159c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/store.scm
View File

@ -830,10 +830,11 @@ bits are kept. HASH-ALGO must be a string such as \"sha256\".
When RECURSIVE? is true, call (SELECT? FILE STAT) for each directory entry, When RECURSIVE? is true, call (SELECT? FILE STAT) for each directory entry,
where FILE is the entry's absolute file name and STAT is the result of where FILE is the entry's absolute file name and STAT is the result of
'lstat'; exclude entries for which SELECT? does not return true." 'lstat'; exclude entries for which SELECT? does not return true."
(let* ((st (false-if-exception (lstat file-name))) ;; Note: We don't stat FILE-NAME at each call, and thus we assume that
(args `(,st ,basename ,recursive? ,hash-algo ,select?)) ;; the file remains unchanged for the lifetime of SERVER.
(let* ((args `(,file-name ,basename ,recursive? ,hash-algo ,select?))
(cache (nix-server-add-to-store-cache server))) (cache (nix-server-add-to-store-cache server)))
(or (and st (hash-ref cache args)) (or (hash-ref cache args)
(let ((path (add-to-store server basename recursive? (let ((path (add-to-store server basename recursive?
hash-algo file-name hash-algo file-name
#:select? select?))) #:select? select?)))