nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

substitute-binary: Work around Guile 2.0.5's broken 'n-par-map'. 

* guix/scripts/substitute-binary.scm (n-par-map*): New procedure.
  (guix-substitute-binary): Use it instead of 'n-par-map'.
  Reported by Nikita Karetnikov and Eric Bavier.
This commit is contained in:
Ludovic Courtès 2013-11-26 22:20:39 +01:00
parent 0edfdb8924
commit de6792699e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
guix/scripts/substitute-binary.scm
View File

@ -487,6 +487,16 @@ Internal tool to substitute a pre-built binary to a local build.\n"))
;;; Entry point. ;;; Entry point.
;;; ;;;
(define n-par-map*
;; We want the ability to run many threads in parallel, regardless of the
;; number of cores. However, Guile 2.0.5 has a bug whereby 'n-par-map' ends
;; up consuming a lot of memory, possibly leading to death. Thus, resort to
;; 'par-map' on 2.0.5.
(if (guile-version>? "2.0.5")
n-par-map
(lambda (n proc lst)
(par-map proc lst))))
(define (guix-substitute-binary . args) (define (guix-substitute-binary . args)
"Implement the build daemon's substituter protocol." "Implement the build daemon's substituter protocol."
(mkdir-p %narinfo-cache-directory) (mkdir-p %narinfo-cache-directory)
@ -503,9 +513,9 @@ Internal tool to substitute a pre-built binary to a local build.\n"))
;; Return the subset of PATHS available in CACHE. ;; Return the subset of PATHS available in CACHE.
(let ((substitutable (let ((substitutable
(if cache (if cache
(n-par-map %lookup-threads (n-par-map* %lookup-threads
(cut lookup-narinfo cache <>) (cut lookup-narinfo cache <>)
paths) paths)
'()))) '())))
(for-each (lambda (narinfo) (for-each (lambda (narinfo)
(when narinfo (when narinfo
@ -516,9 +526,9 @@ Internal tool to substitute a pre-built binary to a local build.\n"))
;; Reply info about PATHS if it's in CACHE. ;; Reply info about PATHS if it's in CACHE.
(let ((substitutable (let ((substitutable
(if cache (if cache
(n-par-map %lookup-threads (n-par-map* %lookup-threads
(cut lookup-narinfo cache <>) (cut lookup-narinfo cache <>)
paths) paths)
'()))) '())))
(for-each (lambda (narinfo) (for-each (lambda (narinfo)
(format #t "~a\n~a\n~a\n" (format #t "~a\n~a\n~a\n"