rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

emacs: Speed up starting the REPL. 

Delay initializing variables.

* emacs/guix-main.scm: (%packages): Rename to...
(%package-vhash): ... this.  Delay setting the value.
(package-vhash): New procedure (wrapper for '%package-vhash').
(%package-table): Delay setting the value.
(package-table): New procedure (wrapper for '%package-table').
(package-by-address, packages-by-name+version): Use wrappers.
This commit is contained in:
Alex Kost 2016-03-31 22:13:23 +03:00
parent 619ff9066d
commit 183f42f90f
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
emacs/guix-main.scm
View File

@ -103,24 +103,34 @@ return two values: name and version. For example, for SPEC
(define name+version->key cons) (define name+version->key cons)
(define key->name+version car+cdr) (define key->name+version car+cdr)
(define %packages (define %package-vhash
(fold-packages (lambda (pkg res) (delay
(vhash-consq (object-address pkg) pkg res)) (fold-packages (lambda (pkg res)
vlist-null)) (vhash-consq (object-address pkg) pkg res))
vlist-null)))
(define (package-vhash)
"Return vhash of 'package ID (address)'/'package' pairs."
(force %package-vhash))
(define %package-table (define %package-table
(let ((table (make-hash-table (vlist-length %packages)))) (delay
(vlist-for-each (let ((table (make-hash-table (vlist-length (package-vhash)))))
(lambda (elem) (vlist-for-each
(match elem (lambda (elem)
((address . pkg) (match elem
(let* ((key (name+version->key (package-name pkg) ((address . pkg)
(package-version pkg))) (let* ((key (name+version->key (package-name pkg)
(ref (hash-ref table key))) (package-version pkg)))
(hash-set! table key (ref (hash-ref table key)))
(if ref (cons pkg ref) (list pkg))))))) (hash-set! table key
%packages) (if ref (cons pkg ref) (list pkg)))))))
table)) (package-vhash))
table)))
(define (package-table)
"Return hash table of 'name+version key'/'list of packages' pairs."
(force %package-table))
(define (manifest-entry->name+version+output entry) (define (manifest-entry->name+version+output entry)
(values (values
@ -330,12 +340,12 @@ Example:
;;; Finding packages. ;;; Finding packages.
(define (package-by-address address) (define (package-by-address address)
(match (vhash-assq address %packages) (match (vhash-assq address (package-vhash))
((_ . package) package) ((_ . package) package)
(_ #f))) (_ #f)))
(define (packages-by-name+version name version) (define (packages-by-name+version name version)
(or (hash-ref %package-table (or (hash-ref (package-table)
(name+version->key name version)) (name+version->key name version))
'())) '()))