X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=c5c0cfabb04643db3a52ca43f9b8f5a7e5d22670;hb=0b333486fdb269350815b00bb8f16659fdc9079a;hp=900c347c26aefd9abf303a6a8812e1a7143e505c;hpb=3bafaae8bf353619d2f97036e874f1c9cb787adf;p=lilypond.git diff --git a/scm/lily.scm b/scm/lily.scm index 900c347c26..c5c0cfabb0 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -1,17 +1,19 @@ -;;;; lily.scm -- toplevel Scheme stuff +;;;; lily.scm -- top-level Scheme stuff ;;;; ;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 1998--2008 Jan Nieuwenhuizen +;;;; +;;;; (c) 1998--2009 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;; Internationalisation: (_i "to be translated") gets an entry in the -;; POT file (gettext ) must be invoked explicitely to do the actual +;; POT file; (gettext ...) must be invoked explicitly to do the actual ;; "translation". -;;(define-macro (_i x) x) -;;(define-macro-public _i (x) x) -;;(define-public-macro _i (x) x) +;; +;; (define-macro (_i x) x) +;; (define-macro-public _i (x) x) +;; (define-public-macro _i (x) x) ;; Abbrv-PWR! + (defmacro-public _i (x) x) (read-enable 'positions) @@ -24,86 +26,144 @@ (define scheme-options-definitions `( - ;; NAMING: either ;; - [subject-]object-object-verb +"ing" ;; - [subject-]-verb-object-object - (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG") - (backend ps "which backend to use by default; Options: eps, null, ps [default], scm, svg)") - (check-internal-types #f "check every property assignment for types") - (clip-systems #f "Generate cut-out snippets of a score") - (datadir #f "LilyPond prefix for data files (Readonly).") - (debug-gc #f "dump memory debugging statistics") - (debug-gc-assert-parsed-dead #f "for memory debugging: -ensure that all refs to parsed objects are dead. This is an internal option, and is switched on automatically for -ddebug-gc.") - (debug-lexer #f "debug the flex lexer") - (debug-page-breaking-scoring #f "dump scores for many different page breaking configurations") - (debug-parser #f "debug the bison parser") - (debug-property-callbacks #f "debug cyclic callback chains") - (debug-skylines #f "debug skylines") + ;; Avoid overlong lines in `lilypond -dhelp'! Strings should not + ;; be longer than 48 characters per line. + + (anti-alias-factor 1 +"Render at higher resolution (using given factor) +and scale down result to prevent jaggies in +PNG images.") + (backend ps +"Select backend. Possible values: 'eps, 'null, +'ps, 'scm, 'svg.") + (check-internal-types #f +"Check every property assignment for types.") + (clip-systems #f +"Generate cut-out snippets of a score.") + (datadir #f +"LilyPond prefix for data files (read-only).") + (debug-gc #f +"Dump memory debugging statistics.") + (debug-gc-assert-parsed-dead #f +"For memory debugging: Ensure that all +references to parsed objects are dead. This is +an internal option, and is switched on +automatically for `-ddebug-gc'.") + (debug-lexer #f +"Debug the flex lexer.") + (debug-page-breaking-scoring #f +"Dump scores for many different page breaking +configurations.") + (debug-parser #f +"Debug the bison parser.") + (debug-property-callbacks #f +"Debug cyclic callback chains.") + (debug-skylines #f +"Debug skylines.") (delete-intermediate-files #f - "delete unusable PostScript files") - (dump-profile #f "dump memory and time information for each file") - (dump-cpu-profile #f "dump timing information (system-dependent)") - (dump-signatures #f "dump output signatures of each system. Used for regression testing.") - - (eps-box-padding #f "Pad EPS bounding box left edge. Guarantee alignment between systems in LaTeX.") +"Delete unusable, intermediate PostScript files.") + (dump-profile #f +"Dump memory and time information for each file.") + (dump-cpu-profile #f +"Dump timing information (system-dependent).") + (dump-signatures #f +"Dump output signatures of each system. Used for +regression testing.") + (eps-box-padding #f +"Pad left edge of the output EPS bounding box by +given amount (in mm).") (gs-load-fonts #f - "load fonts via Ghostscript.") +"Load fonts via Ghostscript.") (gs-load-lily-fonts #f - "load only lilypond fonts via Ghostscript.") - (gui #f "running from gui; redirect stderr to log file") - (help #f "show this help.") - (include-book-title-preview #t "include book-titles in preview images.") - (include-eps-fonts #t "Include fonts in separate-system EPS files.") - (job-count #f "Process in parallel") - (log-file #f "redirect output to log FILE.log") +"Load only LilyPond fonts via Ghostscript.") + (gui #f +"Run LilyPond from a GUI and redirect stderr to +a log file.") + (help #f +"Show this help.") + (include-book-title-preview #t +"Include book titles in preview images.") + (include-eps-fonts #t +"Include fonts in separate-system EPS files.") + (job-count #f +"Process in parallel, using the given number of +jobs.") + (log-file #f +"If string FOO is given as argument, redirect +output to log file `FOO.log'.") (midi-extension ,(if (eq? PLATFORM 'windows) "mid" "midi") - "set the default file extension for MIDI") - +"Set the default file extension for MIDI output +file to given string.") (old-relative #f - "relative for simultaneous music works -similar to chord syntax") - (point-and-click #t "use point & click") - (paper-size "a4" "the default paper size") - (pixmap-format "png16m" "GS format to use for pixel images") - (preview #f "make a incipit image. ") - (print-pages #t "print pages normally. ") - (protected-scheme-parsing #t "continue when finding errors in inline -scheme are caught in the parser. If off, halt -on errors, and print a stack trace.") - (profile-property-accesses #f "keep statistics of get_property() calls.") - - (resolution 101 "resolution for generating PNG bitmaps") - (read-file-list #f "Read files to be processed from command line arguments") - - (safe #f "Run safely") - (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN.") - (strip-output-dir #t "If yes, strip directories from input files.") - (separate-log-files #f "Output to FILE.log per file.") - (trace-memory-frequency #f "Record Scheme cell usage this many times per second, and dump to file.") - (trace-scheme-coverage #f "Record coverage of Scheme files") +"Make \\relative mode for simultaneous music work +similar to chord syntax.") + (point-and-click #t +"Add point & click links to PDF output.") + (paper-size "a4" +"Set default paper size.") + (pixmap-format "png16m" +"Set GhostScript's output format for pixel images.") + (preview #f +"Create PNG and EPS preview images also.") + (print-pages #t +"Print pages in the normal way.") + (protected-scheme-parsing #t +"Continue when errors in inline scheme are caught +in the parser. If #f, halt on errors and print +a stack trace.") + (profile-property-accesses #f +"Keep statistics of get_property() calls.") + (resolution 101 +"Set resolution for generating PNG pixmaps to +given value (in dpi).") + (read-file-list #f +"Specify name of a file which contains a list of +input files to be processed.") + (relative-includes #f +"When processing an \\include command, look for +the included file relative to the current file +(instead of the root file)") + (safe #f +"Run in safer mode.") + (strict-infinity-checking #f +"Force a crash on encountering Inf and NaN +floating point exceptions.") + (strip-output-dir #t +"Don't use directories from input files while +constructing output file names.") + (separate-log-files #f +"For input files `FILE1.ly', `FILE2.ly', ... +output log data to files `FILE1.log', +`FILE2.log', ...") + (trace-memory-frequency #f +"Record Scheme cell usage this many times per +second. Dump results to `FILE.stacks' and +`FILE.graph'.") + (trace-scheme-coverage #f +"Record coverage of Scheme files in `FILE.cov'.") (show-available-fonts #f - "List font names available.") - (verbose ,(ly:command-line-verbose?) "value for the --verbose flag") +"List available font names.") + (verbose ,(ly:command-line-verbose?) +"Value of the --verbose flag (read-only).") )) -;; need to do this in the beginning. Other parts of the -;; Scheme init depend on these options. -;; -(for-each - (lambda (x) - (ly:add-option (car x) (cadr x) (caddr x))) - scheme-options-definitions) +;; Need to do this in the beginning. Other parts of the Scheme +;; initialization depend on these options. -(for-each - (lambda (x) - (ly:set-option (car x) (cdr x))) - (eval-string (ly:command-line-options))) +(for-each (lambda (x) + (ly:add-option (car x) (cadr x) (caddr x))) + scheme-options-definitions) + +(for-each (lambda (x) + (ly:set-option (car x) (cdr x))) + (eval-string (ly:command-line-options))) (debug-set! stack 0) @@ -123,41 +183,46 @@ on errors, and print a stack trace.") (srfi srfi-14) (scm clip-region) (scm memory-trace) - (scm coverage) - ) -(define-public fancy-format format) + (scm coverage)) + +(define-public fancy-format + format) + (define-public (ergonomic-simple-format dest . rest) "Like ice-9 format, but without the memory consumption." - (if (string? dest) (apply simple-format (cons #f (cons dest rest))) (apply simple-format (cons dest rest)))) -(define format ergonomic-simple-format) +(define format + ergonomic-simple-format) ;; my display -(define-public (myd k v) (display k) (display ": ") (display v) (display ", ") +(define-public (myd k v) + (display k) + (display ": ") + (display v) + (display ", ") v) (define-public (print . args) (apply format (cons (current-output-port) args))) -;;; General settings -;;; debugging evaluator is slower. This should -;;; have a more sensible default. +;;; General settings. +;;; +;;; Debugging evaluator is slower. This should have a more sensible +;;; default. (if (or (ly:get-option 'verbose) (ly:get-option 'trace-memory-frequency) - (ly:get-option 'trace-scheme-coverage) - ) + (ly:get-option 'trace-scheme-coverage)) (begin (ly:set-option 'protected-scheme-parsing #f) (debug-enable 'debug) (debug-enable 'backtrace) (read-enable 'positions))) - (if (ly:get-option 'trace-scheme-coverage) (coverage:enable)) @@ -177,7 +242,7 @@ on errors, and print a stack trace.") (ly:error (_ "cannot find: ~A") x)) (primitive-load file-name) (if (ly:get-option 'verbose) - (ly:progress "]")))) + (ly:progress "]\n")))) (define-public DOS (let ((platform (string-tokenize @@ -187,17 +252,23 @@ on errors, and print a stack trace.") (case PLATFORM ((windows) - (define native-getcwd getcwd) + (define native-getcwd + getcwd) + (define (slashify x) (if (string-index x #\\) x (string-regexp-substitute "//*" "/" (string-regexp-substitute "\\\\" "/" x)))) + ;; FIXME: this prints a warning. (define-public (ly-getcwd) (slashify (native-getcwd)))) - (else (define-public ly-getcwd getcwd))) + + (else + (define-public ly-getcwd + getcwd))) (define-public (is-absolute? file-name) (let ((file-name-length (string-length file-name))) @@ -212,13 +283,11 @@ on errors, and print a stack trace.") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (type-check-list location signature arguments) - "Typecheck a list of arguments against a list of type -predicates. Print a message at LOCATION if any predicate failed." - - (define (recursion-helper signature arguments count) - (define (helper pred? arg count) + "Typecheck a list of arguments against a list of type predicates. +Print a message at LOCATION if any predicate failed." + (define (recursion-helper signature arguments count) + (define (helper pred? arg count) (if (not (pred? arg)) - (begin (ly:input-message location @@ -232,14 +301,12 @@ predicates. Print a message at LOCATION if any predicate failed." #t (and (helper (car signature) (car arguments) count) (recursion-helper (cdr signature) (cdr arguments) (1+ count))))) - (recursion-helper signature arguments 1)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; output - -;;(define-public (output-framework) (write "hello\n")) +;; (define-public (output-framework) (write "hello\n")) (define output-ps-module (make-module 1021 (list (resolve-interface '(scm output-ps))))) @@ -249,15 +316,18 @@ predicates. Print a message at LOCATION if any predicate failed." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Safe definitions utility -(define safe-objects (list)) + +(define safe-objects + (list)) (define-macro (define-safe-public arglist . body) - "Define a variable, export it, and mark it as safe, ie usable in LilyPond safe mode. -The syntax is the same as `define*-public'." + "Define a variable, export it, and mark it as safe, i.e. usable in +LilyPond safe mode. The syntax is the same as `define*-public'." (define (get-symbol arg) (if (pair? arg) (get-symbol (car arg)) arg)) + (let ((safe-symbol (get-symbol arglist))) `(begin (define*-public ,arglist @@ -279,70 +349,63 @@ The syntax is the same as `define*-public'." (ly:set-default-scale (ly:make-scale #(0 1 2 5/2 7/2 9/2 11/2))) - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; other files. - -(define - init-scheme-files +(define init-scheme-files '("lily-library.scm" - "file-cache.scm" - "define-event-classes.scm" - "define-music-types.scm" - "output-lib.scm" - "c++.scm" - "chord-ignatzek-names.scm" - "chord-entry.scm" - "chord-generic-names.scm" - "stencil.scm" - "markup.scm" - "music-functions.scm" - "part-combiner.scm" - "autochange.scm" - "define-music-properties.scm" - "auto-beam.scm" - "chord-name.scm" - - "parser-ly-from-scheme.scm" - "ly-syntax-constructors.scm" - - "define-context-properties.scm" - "translation-functions.scm" - "script.scm" - "midi.scm" - "layout-beam.scm" - "parser-clef.scm" - "layout-slur.scm" - "font.scm" - "encoding.scm" - - "flag-styles.scm" - "fret-diagrams.scm" - "harp-pedals.scm" - "predefined-fretboards.scm" - "define-markup-commands.scm" - "define-grob-properties.scm" - "define-grobs.scm" - "define-grob-interfaces.scm" - "define-stencil-commands.scm" - "titling.scm" - - "paper.scm" - "backend-library.scm" - "x11-color.scm" - - ;; must be after everything has been defined - "safe-lily.scm")) - + "file-cache.scm" + "define-event-classes.scm" + "define-music-types.scm" + "output-lib.scm" + "c++.scm" + "chord-ignatzek-names.scm" + "chord-entry.scm" + "chord-generic-names.scm" + "stencil.scm" + "markup.scm" + "music-functions.scm" + "part-combiner.scm" + "autochange.scm" + "define-music-properties.scm" + "auto-beam.scm" + "chord-name.scm" + + "parser-ly-from-scheme.scm" + "ly-syntax-constructors.scm" + + "define-context-properties.scm" + "translation-functions.scm" + "script.scm" + "midi.scm" + "layout-beam.scm" + "parser-clef.scm" + "layout-slur.scm" + "font.scm" + "encoding.scm" + + "flag-styles.scm" + "fret-diagrams.scm" + "harp-pedals.scm" + "predefined-fretboards.scm" + "define-markup-commands.scm" + "define-grob-properties.scm" + "define-grobs.scm" + "define-grob-interfaces.scm" + "define-stencil-commands.scm" + "titling.scm" + + "paper.scm" + "backend-library.scm" + "x11-color.scm" + + ;; must be after everything has been defined + "safe-lily.scm")) (for-each ly:load init-scheme-files) - (set! type-p-name-alist - `( - (,boolean-or-symbol? . "boolean or symbol") + `((,boolean-or-symbol? . "boolean or symbol") (,boolean? . "boolean") (,char? . "char") (,grob-list? . "list of grobs") @@ -369,7 +432,7 @@ The syntax is the same as `define*-public'." (,number-or-string? . "number or string") (,number-pair? . "pair of numbers") (,number? . "number") - (,output-port? . "output port") + (,output-port? . "output port") (,pair? . "pair") (,procedure? . "procedure") (,rhythmic-location? . "rhythmic location") @@ -384,77 +447,67 @@ The syntax is the same as `define*-public'." (define (profile-measurements) (let* ((t (times)) (stats (gc-stats))) - - (list - (- (+ (tms:cutime t) - (tms:utime t)) - (ly:assoc-get 'gc-time-taken stats)) - - (ly:assoc-get 'total-cells-allocated stats 0) - ))) + (list (- (+ (tms:cutime t) + (tms:utime t)) + (ly:assoc-get 'gc-time-taken stats)) + (ly:assoc-get 'total-cells-allocated stats 0)))) (define (dump-profile base last this) - (let* - ((outname (format "~a.profile" (dir-basename base ".ly"))) - (diff (map (lambda (y) (apply - y)) (zip this last)))) - + (let* ((outname (format "~a.profile" (dir-basename base ".ly"))) + (diff (map (lambda (y) (apply - y)) (zip this last)))) (ly:progress "\nWriting timing to ~a..." outname) (format (open-file outname "w") "time: ~a\ncells: ~a\n" (if (ly:get-option 'dump-cpu-profile) (car diff) 0) - (cadr diff) - ))) - + (cadr diff)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; debug mem leaks +;; debug memory leaks + +(define gc-dumping + #f) -(define gc-dumping #f) -(define gc-protect-stat-count 0) +(define gc-protect-stat-count + 0) (define-public (dump-live-object-stats outfile) - (for-each - (lambda (x) - (format outfile "~a: ~a\n" (car x) (cdr x))) - (sort (gc-live-object-stats) - (lambda (x y) - (stringalist (ly:protects)) - (lambda (a b) - (< (object-address (car a)) - (object-address (car b)))))) - + (let* ((protects (sort (hash-table->alist (ly:protects)) + (lambda (a b) + (< (object-address (car a)) + (object-address (car b)))))) (out-file-name (string-append "gcstat-" (number->string gc-protect-stat-count) ".scm")) - (outfile (open-file out-file-name "w"))) - + (outfile (open-file out-file-name "w"))) (set! gc-dumping #t) (display (format "Dumping GC statistics ~a...\n" out-file-name)) - (display - (map (lambda (y) - (let ((x (car y)) - (c (cdr y))) - (display - (format "~a (~a) = ~a\n" (object-address x) c x) - outfile))) - (filter - (lambda (x) - (not (symbol? (car x)))) - protects)) - outfile) - + (display (map (lambda (y) + (let ((x (car y)) + (c (cdr y))) + (display + (format "~a (~a) = ~a\n" (object-address x) c x) + outfile))) + (filter + (lambda (x) + (not (symbol? (car x)))) + protects)) + outfile) (format outfile "\nprotected symbols: ~a\n" - (apply + (map (lambda (obj-count) (if (symbol? (car obj-count)) - (cdr obj-count) - 0)) - protects))) + (apply + (map (lambda (obj-count) + (if (symbol? (car obj-count)) + (cdr obj-count) + 0)) + protects))) ;; (display (ly:smob-protects)) (newline outfile) @@ -468,188 +521,146 @@ The syntax is the same as `define*-public'." (ly:set-option 'debug-gc-assert-parsed-dead #t) (gc) (ly:set-option 'debug-gc-assert-parsed-dead #f) - (set! stats (gc-live-object-stats)) (display "Dumping live object statistics.\n") (dump-live-object-stats outfile))) - (newline outfile) - (let* - ((stats (gc-stats))) - - (for-each - (lambda (sym) - (display - (format "~a ~a ~a\n" - gc-protect-stat-count - sym - (let ((sym-stat (assoc sym stats))) - (if sym-stat - (cdr sym-stat) - "?"))) - outfile)) - '(protected-objects bytes-malloced cell-heap-size - - ))) - + (let* ((stats (gc-stats))) + (for-each (lambda (sym) + (display + (format "~a ~a ~a\n" + gc-protect-stat-count + sym + (let ((sym-stat (assoc sym stats))) + (if sym-stat + (cdr sym-stat) + "?"))) + outfile)) + '(protected-objects bytes-malloced cell-heap-size))) (set! gc-dumping #f) - (close-port outfile) - - )) - + (close-port outfile))) (define (check-memory) - "read /proc/self to check up on memory use." + "Read `/proc/self' to check up on memory use." (define (gulp-file name) (let* ((file (open-input-file name)) (text (read-delimited "" file))) (close file) text)) - (let* - ((stat (gulp-file "/proc/self/status")) - (lines (string-split stat #\newline)) - (interesting (filter identity - (map - (lambda (l) - (string-match "^VmData:[ \t]*([0-9]*) kB" l)) - lines))) - (mem (string->number (match:substring (car interesting) 1))) - ) - - + + (let* ((stat (gulp-file "/proc/self/status")) + (lines (string-split stat #\newline)) + (interesting (filter identity + (map + (lambda (l) + (string-match "^VmData:[ \t]*([0-9]*) kB" l)) + lines))) + (mem (string->number (match:substring (car interesting) 1)))) (display (format "VMDATA: ~a\n" mem)) (display (gc-stats)) (if (> mem 100000) - (begin - (dump-gc-protects) - (raise 1))) - - )) + (begin (dump-gc-protects) + (raise 1))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (define (multi-fork count) - "Split this process in COUNT helpers. Returns either a list of pids, -or the number of the process." + "Split this process into COUNT helpers. Returns either a list of +PIDs or the number of the process." (define (helper count acc) (if (> count 0) - (let* - ((pid (primitive-fork))) - (if (= pid 0) - (1- count) - (helper (1- count) (cons pid acc)))) - acc)) + (let* ((pid (primitive-fork))) + (if (= pid 0) + (1- count) + (helper (1- count) (cons pid acc)))) + acc)) + (helper count '())) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define-public (lilypond-main files) "Entry point for LilyPond." - (eval-string (ly:command-line-code)) - (if (ly:get-option 'help) - (begin - (ly:option-usage) - (exit 0))) - + (begin (ly:option-usage) + (exit 0))) (if (ly:get-option 'show-available-fonts) - (begin - (ly:font-config-display-fonts) - (exit 0) - )) - - + (begin (ly:font-config-display-fonts) + (exit 0))) (if (ly:get-option 'gui) (gui-main files)) - (if (null? files) - (begin - (ly:usage) - (exit 2))) - + (begin (ly:usage) + (exit 2))) (if (ly:get-option 'read-file-list) (set! files (filter (lambda (s) (> (string-length s) 0)) (apply append - (map (lambda (f) (string-split (ly:gulp-file f) #\nl)) - files))) - )) - + (map (lambda (f) + (string-split (ly:gulp-file f) #\nl)) + files))))) (if (and (number? (ly:get-option 'job-count)) (>= (length files) (ly:get-option 'job-count))) - (let* - ((count (ly:get-option 'job-count)) - (split-todo (split-list files count)) - (joblist (multi-fork count)) - (errors '())) - + (let* ((count (ly:get-option 'job-count)) + (split-todo (split-list files count)) + (joblist (multi-fork count)) + (errors '())) (if (not (string-or-symbol? (ly:get-option 'log-file))) (ly:set-option 'log-file "lilypond-multi-run")) - (if (number? joblist) - (begin - (ly:set-option - 'log-file (format "~a-~a" - (ly:get-option 'log-file) joblist)) - (set! files (vector-ref split-todo joblist))) - - (begin - (ly:progress "\nForking into jobs: ~a\n" joblist) - (for-each - (lambda (pid) - (let* ((stat (cdr (waitpid pid)))) - - (if (not (= stat 0)) - (set! errors - (acons (list-element-index joblist pid) - stat errors))))) - joblist) - - (for-each - (lambda (x) - (let* ((job (car x)) - (state (cdr x)) - (logfile (format "~a-~a.log" - (ly:get-option 'log-file) job)) - (log (ly:gulp-file logfile)) - (len (string-length log)) - (tail (substring log (max 0 (- len 1024))))) - - (if (status:term-sig state) - (ly:message - "\n\n~a\n" - (format (_ "job ~a terminated with signal: ~a") - job (status:term-sig state))) - (ly:message - (_ "logfile ~a (exit ~a):\n~a") - logfile (status:exit-val state) tail)))) - - errors) - - (if (pair? errors) - (ly:error "Children ~a exited with errors." (map car errors))) - - ;; must overwrite individual entries - (if (ly:get-option 'dump-profile) - (dump-profile "lily-run-total" '(0 0) (profile-measurements))) - - (exit (if (null? errors) 0 1)))))) - + (begin (ly:set-option + 'log-file (format "~a-~a" + (ly:get-option 'log-file) joblist)) + (set! files (vector-ref split-todo joblist))) + (begin (ly:progress "\nForking into jobs: ~a\n" joblist) + (for-each + (lambda (pid) + (let* ((stat (cdr (waitpid pid)))) + (if (not (= stat 0)) + (set! errors + (acons (list-element-index joblist pid) + stat errors))))) + joblist) + (for-each + (lambda (x) + (let* ((job (car x)) + (state (cdr x)) + (logfile (format "~a-~a.log" + (ly:get-option 'log-file) job)) + (log (ly:gulp-file logfile)) + (len (string-length log)) + (tail (substring log (max 0 (- len 1024))))) + (if (status:term-sig state) + (ly:message + "\n\n~a\n" + (format (_ "job ~a terminated with signal: ~a") + job (status:term-sig state))) + (ly:message + (_ "logfile ~a (exit ~a):\n~a") + logfile (status:exit-val state) tail)))) + errors) + (if (pair? errors) + (ly:error "Children ~a exited with errors." + (map car errors))) + ;; must overwrite individual entries + (if (ly:get-option 'dump-profile) + (dump-profile "lily-run-total" + '(0 0) (profile-measurements))) + (exit (if (null? errors) + 0 + 1)))))) (if (string-or-symbol? (ly:get-option 'log-file)) (ly:stderr-redirect (format "~a.log" (ly:get-option 'log-file)) "w")) - (let ((failed (lilypond-all files))) (if (ly:get-option 'trace-scheme-coverage) (begin - (coverage:show-all (lambda (f) (string-contains f "lilypond")) - ))) - + (coverage:show-all (lambda (f) + (string-contains f "lilypond"))))) (if (pair? failed) - (begin - (ly:error (_ "failed files: ~S") (string-join failed)) - (exit 1)) + (begin (ly:error (_ "failed files: ~S") (string-join failed)) + (exit 1)) (begin ;; HACK: be sure to exit with single newline (ly:message "") @@ -662,63 +673,48 @@ or the number of the process." (if separate-logs (open-file (if (string-or-symbol? (ly:get-option 'log-file)) (format "~a.log" (ly:get-option 'log-file)) - "/dev/tty") "a") #f)) + "/dev/stderr") "a") #f)) (do-measurements (ly:get-option 'dump-profile)) (handler (lambda (key failed-file) (set! failed (append (list failed-file) failed))))) - (gc) (for-each (lambda (x) - (let* - ((start-measurements (if do-measurements - (profile-measurements) - #f)) - (base (dir-basename x ".ly")) - (all-settings (ly:all-options))) - + (let* ((start-measurements (if do-measurements + (profile-measurements) + #f)) + (base (dir-basename x ".ly")) + (all-settings (ly:all-options))) (if separate-logs (ly:stderr-redirect (format "~a.log" base) "w")) (if ping-log - (format ping-log "Procesing ~a\n" base)) - - (if (ly:get-option 'trace-memory-frequency) + (format ping-log "Processing ~a\n" base)) + (if (ly:get-option 'trace-memory-frequency) (mtrace:start-trace (ly:get-option 'trace-memory-frequency))) - (lilypond-file handler x) (if start-measurements (dump-profile x start-measurements (profile-measurements))) - (if (ly:get-option 'trace-memory-frequency) - (begin - (mtrace:stop-trace) - (mtrace:dump-results base))) - - (for-each - (lambda (s) - (ly:set-option (car s) (cdr s))) - all-settings) - + (begin (mtrace:stop-trace) + (mtrace:dump-results base))) + (for-each (lambda (s) + (ly:set-option (car s) (cdr s))) + all-settings) (ly:clear-anonymous-modules) (ly:set-option 'debug-gc-assert-parsed-dead #t) (gc) (ly:set-option 'debug-gc-assert-parsed-dead #f) - - (if (ly:get-option 'debug-gc) (dump-gc-protects) (if (= (random 40) 1) (ly:reset-all-fonts))))) - files) ;; we want the failed-files notice in the aggregrate logfile. (if ping-log (format ping-log "Failed files: ~a\n" failed)) - (if (ly:get-option 'dump-profile) (dump-profile "lily-run-total" '(0 0) (profile-measurements))) - failed)) (define (lilypond-file handler file-name) @@ -731,7 +727,6 @@ or the number of the process." (define-public (gui-main files) (if (null? files) (gui-no-files-handler)) - (if (not (string? (ly:get-option 'log-file))) (let* ((base (dir-basename (car files) ".ly")) (log-name (string-append base ".log"))) @@ -739,23 +734,22 @@ or the number of the process." (ly:message (_ "Redirecting output to ~a...") log-name)) (ly:stderr-redirect log-name "w") (ly:message "# -*-compilation-*-")) - - (let ((failed (lilypond-all files))) - (if (pair? failed) - (begin - ;; ugh - (ly:stderr-redirect "foo" "r") - (system (get-editor-command log-name 0 0 0)) - (ly:error (_ "failed files: ~S") (string-join failed)) - ;; not reached? - (exit 1)) - (exit 0))))) + (let ((failed (lilypond-all files))) + (if (pair? failed) + (begin + ;; ugh + (ly:stderr-redirect "foo" "r") + (system (get-editor-command log-name 0 0 0)) + (ly:error (_ "failed files: ~S") (string-join failed)) + ;; not reached? + (exit 1)) + (exit 0))))) (define (gui-no-files-handler) (let* ((ly (string-append (ly:effective-prefix) "/ly/")) ;; FIXME: soft-code, localize (welcome-ly (string-append ly "Welcome_to_LilyPond.ly")) (cmd (get-editor-command welcome-ly 0 0 0))) - (ly:message (_ "Invoking `~a'...") cmd) + (ly:message (_ "Invoking `~a'...\n") cmd) (system cmd) (exit 1)))