fix class names

This commit is contained in:
Kevin Tew 2011-07-12 15:38:57 -06:00
parent a8fd86d780
commit 8aca195b35
3 changed files with 22 additions and 22 deletions

View File

@ -23,7 +23,7 @@
; (begin a ...)
)
(define Lock-Manager% (class object%
(define lock-manager% (class object%
(field (locks (make-hash)))
(define/public (lock fn wrkr)
(let ([v (hash-ref locks fn #f)])
@ -42,7 +42,7 @@
(hash-remove! locks fn)]))
(super-new)))
(define/class/generics Lock-Manager%
(define/class/generics lock-manager%
(lm/lock lock fn wrkr)
(lm/unlock unlock fn))
@ -50,9 +50,9 @@
(cond [(path? x) (path->bytes x)]
[(string? x) (string->bytes/locale x)]))
(define CollectsQueue% (class* object% (WorkQueue<%>)
(define collects-queue% (class* object% (work-queue<%>)
(init-field cclst printer append-error)
(field (lock-mgr (new Lock-Manager%)))
(field (lock-mgr (new lock-manager%)))
(field (hash (make-hash)))
(inspect #f)
@ -164,9 +164,9 @@
(define/public (get-results) (void))
(super-new)))
(define FileListQueue% (class* object% (WorkQueue<%>)
(define file-list-queue% (class* object% (work-queue<%>)
(init-field filelist handler)
(field (lock-mgr (new Lock-Manager%)))
(field (lock-mgr (new lock-manager%)))
(inspect #f)
(define/public (work-done work wrkr msg)
@ -259,9 +259,9 @@
(define (parallel-compile-files list-of-files
#:worker-count [worker-count (processor-count)]
#:handler [handler void])
(parallel-build (make-object FileListQueue% list-of-files handler) worker-count))
(parallel-build (make-object file-list-queue% list-of-files handler) worker-count))
(define (parallel-compile worker-count setup-fprintf append-error collects-tree)
(setup-fprintf (current-output-port) #f "--- parallel build using ~a processes ---" worker-count)
(define collects-queue (make-object CollectsQueue% collects-tree setup-fprintf append-error))
(define collects-queue (make-object collects-queue% collects-tree setup-fprintf append-error))
(parallel-build collects-queue worker-count))

View File

@ -22,9 +22,9 @@
send/msg
recv/req
worker/die
WorkQueue<%>
work-queue<%>
define/class/generics
ListQueue)
list-queue)
(define-syntax-rule (mk-generic func clss method args ...)
(begin
@ -47,7 +47,7 @@
; (begin a ...)
)
(define Worker<%> (interface ()
(define worker<%> (interface ()
spawn
send/msg
kill
@ -58,7 +58,7 @@
get-id
get-out))
(define Worker% (class* object% (Worker<%>)
(define worker% (class* object% (worker<%>)
(field [id 0]
[process-handle null]
[out null]
@ -110,7 +110,7 @@
(define/public (wait) (subprocess-wait process-handle))
(super-new)))
(define PlaceWorker% (class* object% (Worker<%>)
(define place-worker% (class* object% (worker<%>)
(init-field [id 0]
[pl null])
@ -134,14 +134,14 @@
(super-new)))
(define WorkQueue<%> (interface ()
(define work-queue<%> (interface ()
get-job
work-done
has-jobs?
jobs-cnt
get-results))
(define/class/generics/provide Worker<%>
(define/class/generics/provide worker<%>
(wrkr/spawn spawn id worker-cmdline-list initialcode initialmsg)
(wrkr/send send/msg msg)
(wrkr/kill kill)
@ -153,7 +153,7 @@
(wrkr/wait wait))
(define/class/generics/provide WorkQueue<%>
(define/class/generics/provide work-queue<%>
(queue/get get-job wrkrid)
(queue/work-done work-done node wrkr msg)
(queue/has has-jobs?)
@ -175,7 +175,7 @@
(define use-places (place-enabled?))
; (define use-places #f)
(define (spawn id)
(define wrkr (if use-places (new PlaceWorker%) (new Worker%)))
(define wrkr (if use-places (new place-worker%) (new worker%)))
(wrkr/spawn wrkr id module-path funcname initialmsg)
wrkr)
(define (jobs?) (queue/has work-queue))
@ -260,7 +260,7 @@
;(printf " ~a" (add1 i)) (flush-output))(printf "\n")
)]))))
(define ListQueue% (class* object% (WorkQueue<%>)
(define list-queue% (class* object% (work-queue<%>)
(init-field queue create-job-thunk success-thunk failure-thunk)
(field [results null])
@ -280,8 +280,8 @@
(define/public (jobs-cnt) (length queue))
(super-new)))
(define (ListQueue list-of-work create-job-thunk job-success-thunk job-failure-thunk)
(make-object ListQueue% list-of-work create-job-thunk job-success-thunk job-failure-thunk))
(define (list-queue list-of-work create-job-thunk job-success-thunk job-failure-thunk)
(make-object list-queue% list-of-work create-job-thunk job-success-thunk job-failure-thunk))
(define-syntax-rule (define-parallel-keyword-error d x)
(d x (lambda (stx) (raise-syntax-error 'x "only allowed inside parallel worker definition" stx))))

View File

@ -140,7 +140,7 @@
(parallel-do
worker-count
(lambda (workerid) (list workerid program-name (verbose) only-dirs latex-dest auto-main? auto-user?))
(ListQueue
(list-queue
docs
(lambda (x) (s-exp->fasl (serialize x)))
(lambda (work r outstr errstr) (printf "~a" outstr) (printf "~a" errstr) (deserialize (fasl->s-exp r)))
@ -323,7 +323,7 @@
(parallel-do
worker-count
(lambda (workerid) (list workerid (verbose) latex-dest))
(ListQueue
(list-queue
need-rerun
(lambda (i)
(say-rendering i)