transmit current-poly-target to parallel rendering place

pull/199/head
Matthew Butterick 6 years ago
parent a34da0b6ed
commit bcf6450e77

@ -1 +1 @@
1556202286 1556304028

@ -57,14 +57,16 @@
[parallel? [parallel?
(define worker-places (define worker-places
(for/list ([i (in-range (processor-count))]) (for/list ([i (in-range (processor-count))])
(place ch (place ch
(let loop () (let loop ()
(define result (match-define (cons path poly-target) (place-channel-get ch))
(with-handlers ([exn:fail? (λ (e) #false)]) (define result
(render-from-source-or-output-path (place-channel-get ch)) (with-handlers ([exn:fail? (λ (e) #false)])
#true)) (parameterize ([current-poly-target poly-target])
(place-channel-put ch result) (render-from-source-or-output-path path))
(loop))))) #true))
(place-channel-put ch result)
(loop)))))
(define flattened-paths (define flattened-paths
(filter file-exists? (filter file-exists?
@ -76,16 +78,16 @@
[path (cons path (loop (cdr paths)))]))))) [path (cons path (loop (cdr paths)))])))))
(for ([path-group (in-list (slice-at flattened-paths (length worker-places)))]) (for ([path-group (in-list (slice-at flattened-paths (length worker-places)))])
(for ([path (in-list path-group)] (for ([path (in-list path-group)]
[(wp wpidx) (in-indexed worker-places)]) [(wp wpidx) (in-indexed worker-places)])
(message (format "rendering parallel on core ~a /~a" (add1 wpidx) (message (format "rendering parallel on core ~a /~a" (add1 wpidx)
(find-relative-path (current-project-root) (->source-path path)))) (find-relative-path (current-project-root) (->source-path path))))
(place-channel-put wp path)) (place-channel-put wp (cons path (current-poly-target))))
(for ([path (in-list path-group)] (for ([path (in-list path-group)]
[(wp wpidx) (in-indexed worker-places)]) [(wp wpidx) (in-indexed worker-places)])
(message (format "rendered parallel on core ~a /~a" (add1 wpidx) (message (format "rendered parallel on core ~a /~a" (add1 wpidx)
(find-relative-path (current-project-root) (->output-path path)))) (find-relative-path (current-project-root) (->output-path path))))
(place-channel-get wp)))] (place-channel-get wp)))]
[else [else
(for-each render-from-source-or-output-path paths)])) (for-each render-from-source-or-output-path paths)]))
@ -109,7 +111,7 @@
has/is-markup-source? has/is-markup-source?
has/is-scribble-source? has/is-scribble-source?
has/is-markdown-source?))]) has/is-markdown-source?))])
(pred so-path)) (pred so-path))
(define-values (source-path output-path) (->source+output-paths so-path)) (define-values (source-path output-path) (->source+output-paths so-path))
(render-to-file-if-needed source-path #f output-path)] (render-to-file-if-needed source-path #f output-path)]
[(pagetree-source? so-path) (render-pagenodes so-path)]) [(pagetree-source? so-path) (render-pagenodes so-path)])
@ -188,7 +190,7 @@
(define render-proc (for/first ([test (in-list tests)] (define render-proc (for/first ([test (in-list tests)]
[render-proc (in-list render-procs)] [render-proc (in-list render-procs)]
#:when (test source-path)) #:when (test source-path))
render-proc)) render-proc))
(unless render-proc (unless render-proc
(raise-argument-error 'render (format "valid rendering function for ~a" source-path) render-proc)) (raise-argument-error 'render (format "valid rendering function for ~a" source-path) render-proc))
@ -275,7 +277,7 @@
(define (file-exists-or-has-source? path) ; path could be #f (define (file-exists-or-has-source? path) ; path could be #f
(and path (for/first ([proc (in-list (list values ->preproc-source-path ->null-source-path))] (and path (for/first ([proc (in-list (list values ->preproc-source-path ->null-source-path))]
#:when (file-exists? (proc path))) #:when (file-exists? (proc path)))
path))) path)))
(define (get-template-from-metas source-path output-path-ext) (define (get-template-from-metas source-path output-path-ext)
(with-handlers ([exn:fail:contract? (λ (e) #f)]) ; in case source-path doesn't work with cached-require (with-handlers ([exn:fail:contract? (λ (e) #f)]) ; in case source-path doesn't work with cached-require
@ -306,7 +308,7 @@
;; output-path may not have an extension ;; output-path may not have an extension
(define output-path-ext (or (get-ext output-path) (current-poly-target))) (define output-path-ext (or (get-ext output-path) (current-poly-target)))
(for/or ([proc (list get-template-from-metas get-default-template get-fallback-template)]) (for/or ([proc (list get-template-from-metas get-default-template get-fallback-template)])
(file-exists-or-has-source? (proc source-path output-path-ext)))))) (file-exists-or-has-source? (proc source-path output-path-ext))))))
(module-test-external (module-test-external
(require pollen/setup sugar/file sugar/coerce) (require pollen/setup sugar/file sugar/coerce)

Loading…
Cancel
Save