From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: Re: [PATCH] build: pull: Compile .scm files in one process. Date: Fri, 13 Nov 2015 15:28:01 +0100 Message-ID: <877flmrn2m.fsf@T420.taylan> References: <87si4kxtge.fsf@T420.taylan> <87611gdul8.fsf@gnu.org> <87h9kzy09b.fsf@T420.taylan> <87bnb6c0nh.fsf@gnu.org> <874mgyxhgy.fsf@T420.taylan> <877flpohu6.fsf@gnu.org> <87mvuku444.fsf@T420.taylan> <87pozgfyzt.fsf@gnu.org> <87io57tt2s.fsf@T420.taylan> <876117mnef.fsf@igalia.com> <87egfvtnbw.fsf@T420.taylan> <87y4e3l7hm.fsf@igalia.com> <87a8qjtje8.fsf@T420.taylan> <876117t0ax.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxFKh-0005Zf-7Y for guix-devel@gnu.org; Fri, 13 Nov 2015 09:28:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxFKf-0004XU-FR for guix-devel@gnu.org; Fri, 13 Nov 2015 09:28:07 -0500 In-Reply-To: <876117t0ax.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 12 Nov 2015 21:44:38 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > taylanbayirli@gmail.com (Taylan Ulrich "Bay=C4=B1rl=C4=B1/Kammer") skribi= s: > >> From 0eaf7d4c264dc531718a4c0b933323f48ea91930 Mon Sep 17 00:00:00 2001 >> From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer= ?=3D >> >> 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. > > Rather: > > =E2=80=A6 (call-with-process, report-build-progress, p-for-each): Remove. Done. >> + (let ((mutex (make-mutex)) >> + (completed 0)) >> + (par-for-each >> + (lambda (file) >> + (with-mutex mutex >> + (display #\cr log-port) >> + (format log-port "compiling...\t~5,1f% of ~d files" ;FIX= ME: i18n >> + (* 100. (/ completed total)) total) >> + (force-output log-port) >> + (format debug-port "~%compiling '~a'...~%" file)) >> + (let ((go (string-append (string-drop-right file 4) ".go")= )) >> + (compile-file file >> + #:output-file go >> + #:opts %auto-compilation-options)) >> + (with-mutex mutex >> + (set! completed (+ 1 completed)))) >> + files))))) > > Does it actually work reliably? :-) > > I think we=E2=80=99re in trouble if DEBUG-PORT is a real port because por= ts > aren=E2=80=99t thread-safe in 2.0, and =E2=80=98compile-file=E2=80=99 mig= ht write to it. Void > ports seem to be OK because their =E2=80=98write=E2=80=99 method doesn=E2= =80=99t do anything. > > So I think we have to do things sequentially when DEBUG-PORT is > non-void. > > I=E2=80=99m also concerned about modules accessed by concurrent calls to > =E2=80=98compile-file=E2=80=99 because modules and hash tables aren=E2=80= =99t thread-safe > either. > > WDYT? > > Thanks to the two of you! Sounds like we=E2=80=99ll soon have a less slo= w or > even a fast =E2=80=98guix pull=E2=80=99. ;-) Hmm, how about this one? I guess it could still garble output if 'compile-file' writes things in small pieces that belong together, but at least it's sure not to crash. Compile-file doesn't seem to write a lot either; one probably won't see much garbled output in practice. Maybe the speed gain makes this acceptable. Re. modules, AFAIUI compile-file shouldn't do any further mutations on modules, since we load them in advance. Maybe Andy can tell how safe this is. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-build-pull-Compile-.scm-files-in-one-process.patch Content-Transfer-Encoding: quoted-printable >From 78be6d09d2d4c0a563be14c66ac2a1a345ff9b1d Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer?=3D 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, report-build-progress) (p-for-each): Remove. (thread-safe-port): New procedure. (build-guix): Load and compile files in one process. --- guix/build/pull.scm | 147 +++++++++++++++++++-----------------------------= ---- 1 file changed, 54 insertions(+), 93 deletions(-) diff --git a/guix/build/pull.scm b/guix/build/pull.scm index 281be23..75bce7c 100644 --- a/guix/build/pull.scm +++ b/guix/build/pull.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013, 2014 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 format) + #:use-module (ice-9 threads) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) @@ -33,75 +35,18 @@ ;;; ;;; Code: =20 -(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-ze= ro." - (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 (thread-safe-port port) + (define mutex (make-mutex)) + (define (wrap proc) + (lambda args + (with-mutex mutex (apply proc args)))) + (make-soft-port + (vector (wrap write-char) (wrap display) (wrap force-output) #f #f) "w"= )) =20 (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 +75,49 @@ containing the source code. Write any debugging outpu= t to DEBUG-PORT." (set! %load-path (cons out %load-path)) (set! %load-compiled-path (cons out %load-compiled-path)) =20 - ;; Compile the .scm files. Do that in independent processes, =C3=A0 la - ;; 'make -j', to work around (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 (FIXME). + (let* ((files + ;; gnu.scm depends on many other modules, so to avoid an early + ;; progress report stall, we move it 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