summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-11-26 22:20:39 +0100
committerLudovic Courtès <ludo@gnu.org>2013-11-26 22:20:39 +0100
commitde6792699e18197c2f710f1812a10e3a587fc8d5 (patch)
treefffa7775ef8177ffb7b73037cb4141e3299f4936
parent0edfdb8924f1dffb03ec4e23b403a5020beb6213 (diff)
downloadpatches-de6792699e18197c2f710f1812a10e3a587fc8d5.tar
patches-de6792699e18197c2f710f1812a10e3a587fc8d5.tar.gz
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.
-rwxr-xr-xguix/scripts/substitute-binary.scm22
1 files changed, 16 insertions, 6 deletions
diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm
index 83e3d25dba..0da29d435b 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -487,6 +487,16 @@ Internal tool to substitute a pre-built binary to a local build.\n"))
;;; 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)
"Implement the build daemon's substituter protocol."
(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.
(let ((substitutable
(if cache
- (n-par-map %lookup-threads
- (cut lookup-narinfo cache <>)
- paths)
+ (n-par-map* %lookup-threads
+ (cut lookup-narinfo cache <>)
+ paths)
'())))
(for-each (lambda (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.
(let ((substitutable
(if cache
- (n-par-map %lookup-threads
- (cut lookup-narinfo cache <>)
- paths)
+ (n-par-map* %lookup-threads
+ (cut lookup-narinfo cache <>)
+ paths)
'())))
(for-each (lambda (narinfo)
(format #t "~a\n~a\n~a\n"