[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] build: pull: Compile .scm files in one process.
From: |
Taylan Ulrich Bayırlı/Kammer |
Subject: |
Re: [PATCH] build: pull: Compile .scm files in one process. |
Date: |
Thu, 12 Nov 2015 11:23:07 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
address@hidden (Ludovic Courtès) writes:
> address@hidden (Taylan Ulrich "Bayırlı/Kammer") skribis:
>
>> address@hidden (Ludovic Courtès) writes:
>
> [...]
>
>>> (gnu scripts environment) imports (gnu packages bash), so we end up
>>> loading a big bunch of (gnu packages …) modules.
>>>
>>> The problem is that (gnu packages commencement) refers to (gnu packages
>>> bash) from its top-level. But here, we are loading (gnu packages bash)
>>> first, which somehow entails loading (gnu packages cross-base), which
>>> loads (gnu packages commencement), which sees a (gnu packages bash)
>>> module containing zero bindings.
>>>
>>> What’s unclear to me though is why (gnu packages cross-base) gets loaded
>>> in the first place.
>>>
>>> Could you investigate in that direction?
>>
>> It seems to be
>>
>> (guix scripts environment) -> (gnu system linux-container) ->
>> (gnu system) -> (gnu packages firmware) -> (gnu packages cross-base)
>
> Good catch.
>
> I’m not sure how to address that. We could introduce lazy references
> with ‘module-ref’ at any of these stages. That would work but sounds
> like a hack. Hmm. Ideas? :-)
After our exchange on IRC, I reached this variant which only moves
gnu.scm to the end which avoids the progress report stall and the
circular import issue.
I think it's worrying that a mere change in order of compilation can
cause errors, but the speed gains of this hopefully make it an
acceptable temporary solution.
Thanks for the help!
>From ef1a1c6cb3f2abd7faa147468d2f062f10adf2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<address@hidden>
Date: Thu, 5 Nov 2015 23:43:20 +0100
Subject: [PATCH] build: pull: Compile .scm files in one process.
* guix/build/pull.scm (call-with-process): Removed procedure.
(report-build-progress): Removed procedure.
(p-for-each): Removed procedure.
(build-guix): Don't create subprocesses to compile the .scm files.
---
guix/build/pull.scm | 127 ++++++++++++++--------------------------------------
1 file changed, 33 insertions(+), 94 deletions(-)
diff --git a/guix/build/pull.scm b/guix/build/pull.scm
index 281be23..da43a5a 100644
--- a/guix/build/pull.scm
+++ b/guix/build/pull.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,75 +34,10 @@
;;;
;;; Code:
-(define (call-with-process thunk)
- "Run THUNK in a separate process that will return 0 if THUNK terminates
-normally, and 1 if an exception is raised."
- (match (primitive-fork)
- (0
- (catch #t
- (lambda ()
- (thunk)
- (primitive-exit 0))
- (lambda (key . args)
- (print-exception (current-error-port) #f key args)
- (primitive-exit 1))))
- (pid
- #t)))
-
-(define* (report-build-progress total completed cont
- #:optional (log-port (current-error-port)))
- "Report that COMPLETED out of TOTAL files have been completed, and call
-CONT."
- (display #\cr log-port)
- (format log-port "compiling...\t~5,1f% of ~d files" ;FIXME: i18n
- (* 100. (/ completed total)) total)
- (force-output log-port)
- (cont))
-
-(define* (p-for-each proc lst
- #:optional (max-processes (current-processor-count))
- #:key (progress report-build-progress))
- "Invoke PROC for each element of LST in a separate process, using up to
-MAX-PROCESSES processes in parallel. Call PROGRESS at each step, passing it
-the continuation. Raise an error if one of the processes exit with non-zero."
- (define total
- (length lst))
-
- (define (wait-for-one-process)
- (match (waitpid WAIT_ANY)
- ((_ . status)
- (unless (zero? (status:exit-val status))
- (error "process failed" proc status)))))
-
- (let loop ((lst lst)
- (running 0)
- (completed 0))
- (match lst
- (()
- (or (zero? running)
- (let ((running (- running 1))
- (completed (+ completed 1)))
- (wait-for-one-process)
- (progress total completed
- (lambda ()
- (loop lst running completed))))))
- ((head . tail)
- (if (< running max-processes)
- (let ((running (+ 1 running)))
- (call-with-process (cut proc head))
- (progress total completed
- (lambda ()
- (loop tail running completed))))
- (let ((running (- running 1))
- (completed (+ completed 1)))
- (wait-for-one-process)
- (progress total completed
- (lambda ()
- (loop lst running completed)))))))))
-
(define* (build-guix out source
#:key gcrypt
- (debug-port (%make-void-port "w")))
+ (debug-port (%make-void-port "w"))
+ (log-port (current-error-port)))
"Build and install Guix in directory OUT using SOURCE, a directory
containing the source code. Write any debugging output to DEBUG-PORT."
(setvbuf (current-output-port) _IOLBF)
@@ -130,33 +66,36 @@ containing the source code. Write any debugging output to
DEBUG-PORT."
(set! %load-path (cons out %load-path))
(set! %load-compiled-path (cons out %load-compiled-path))
- ;; Compile the .scm files. Do that in independent processes, à la
- ;; 'make -j', to work around <http://bugs.gnu.org/15602> (FIXME).
- ;; This ensures correctness, but is overly conservative and slow.
- ;; The solution initially implemented (and described in the bug
- ;; above) was slightly faster but consumed memory proportional to the
- ;; number of modules, which quickly became unacceptable.
- (p-for-each (lambda (file)
- (let ((go (string-append (string-drop-right file 4)
- ".go")))
- (format debug-port "~%compiling '~a'...~%" file)
- (parameterize ((current-warning-port debug-port))
- (compile-file file
- #:output-file go
- #:opts
- %auto-compilation-options))))
-
- (filter (cut string-suffix? ".scm" <>)
-
- ;; Build guix/*.scm before gnu/*.scm to speed
- ;; things up.
- (sort (find-files out "\\.scm")
- (let ((guix (string-append out "/guix"))
- (gnu (string-append out "/gnu")))
- (lambda (a b)
- (or (and (string-prefix? guix a)
- (string-prefix? gnu b))
- (string<? a b))))))))
+ ;; Compile the .scm files. Also load every compiled file after writing it
+ ;; to work around <http://bugs.gnu.org/15602> (FIXME).
+ (let* ((files
+ ;; gnu.scm depends on many other modules, so to avoid an early
+ ;; progress report stall, we move its compilation to the end.
+ (sort (filter (cut string-suffix? ".scm" <>)
+ (find-files out "\\.scm"))
+ (lambda (a b)
+ (or (string-prefix? (string-append out "/gnu.scm") b)
+ (string<? a b)))))
+ (total (length files)))
+ (let loop ((files files)
+ (completed 0))
+ (match files
+ (() *unspecified*)
+ ((file . files)
+ (display #\cr log-port)
+ (format log-port "compiling...\t~5,1f% of ~d files" ;FIXME: i18n
+ (* 100. (/ completed total)) total)
+ (force-output log-port)
+ (let ((go (string-append (string-drop-right file 4)
+ ".go")))
+ (format debug-port "~%compiling '~a'...~%" file)
+ (parameterize ((current-warning-port debug-port))
+ (compile-file file
+ #:output-file go
+ #:opts
+ %auto-compilation-options)
+ (load-compiled go)))
+ (loop files (+ 1 completed)))))))
;; Remove the "fake" (guix config).
(delete-file (string-append out "/guix/config.scm"))
--
2.5.0
- [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/05
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/05
- Re: [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/06
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/06
- Re: [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/07
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/10
- Re: [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/11
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/11
- Re: [PATCH] build: pull: Compile .scm files in one process.,
Taylan Ulrich Bayırlı/Kammer <=
- Re: [PATCH] build: pull: Compile .scm files in one process., Andy Wingo, 2015/11/12
- Re: [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/12
- Re: [PATCH] build: pull: Compile .scm files in one process., Andy Wingo, 2015/11/12
- Re: [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/12
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/12
- Re: [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/13
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/14
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/26
- Re: [PATCH] build: pull: Compile .scm files in one process., Taylan Ulrich Bayırlı/Kammer, 2015/11/27
- Re: [PATCH] build: pull: Compile .scm files in one process., Ludovic Courtès, 2015/11/27