suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Places: rename place and place/anon

Browse Source
This commit is contained in:
Kevin Tew 2011-06-10 11:06:29 -06:00
parent 8f6a4c5549
commit 1473b7775f
11 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
collects/racket/place.rkt
View File

@ -11,7 +11,7 @@
(for-syntax racket/base
racket/syntax))
(provide place
(provide place-dynamic
place-sleep
place-wait
place-kill
@ -23,8 +23,7 @@
place?
place-channel-put/get
processor-count
place/anon
place/thunk
place
define-place
(rename-out [pl-place-enabled? place-enabled?]))
@ -46,7 +45,7 @@
(loop)))))
ch))
(define (th-place mod funcname)
(define (th-place-dynamic mod funcname)
(unless (or (path-string? mod) (resolved-module-path? mod))
(raise-type-error 'place "resolved-module-path? or path-string?" 0 mod funcname))
(unless (symbol? funcname)
@ -121,7 +120,7 @@
(define-syntax-rule (define-pl x p t) (define x (if (pl-place-enabled?) p t)))
(define-pl place pl-place th-place)
(define-pl place-dynamic pl-place-dynamic th-place-dynamic)
(define-pl place-sleep pl-place-sleep th-place-sleep)
(define-pl place-wait pl-place-wait th-place-wait)
(define-pl place-kill pl-place-kill th-place-kill)
@ -147,13 +146,13 @@
#'(let ([module-path (resolved-module-path-name
(variable-reference->resolved-module-path
(#%variable-reference)))])
(place module-path (quote funcname))))]))
(place-dynamic module-path (quote funcname))))]))
(define-syntax (place/thunk stx)
(with-syntax ([create-place (gen-create-place stx)])
#'(lambda () create-place)))
(define-syntax (place/anon stx)
(define-syntax (place stx)
(gen-create-place stx))

21
collects/scribblings/reference/places.scrbl
View File

@ -64,7 +64,7 @@ message to each, and then waits for the places to complete and return:
@racketblock[
(let ([pls (for/list ([i (in-range 2)])
(place "place-worker.rkt" 'place-main))])
(place-dynamic "place-worker.rkt" 'place-main))])
(for ([i (in-range 2)]
[p pls])
(place-channel-put p i)
@ -98,7 +98,7 @@ racket
@racket[#f] otherwise.
}
@defproc[(place [module-path module-path?] [start-proc symbol?]) place?]{
@defproc[(place-dynamic [module-path module-path?] [start-proc symbol?]) place?]{
Creates a @tech{place} to run the procedure that is identified by
@racket[module-path] and @racket[start-proc]. The result is a
@ -127,25 +127,12 @@ racket
Terminates the place indicated by @racket[p],
}
@defform[(place/thunk place-channel? body ...)]{
@defform[(place place-channel? body ...)]{
In-line definition of a place worker body, which is lifted up to module scope.
@racket[place/thunk] closes over only module scope variables.
Returns a thunk for creating the described place.
}
@defform[(place/anon place-channel? body ...)]{
In-line definition of a place worker body, which is lifted up to module scope.
@racket[place/anon] closes over only module scope variables.
@racket[place] closes over only module scope variables.
Returns the place descriptor for the newly constructed place.
}
@defform[(define-place (place-name-id place-channel-id) body ...)]{
In-line definition of a place worker body, which is lifted up to module scope.
@racket[define-place] closes over only module scope variables.
Defines a procedure for creating the described place.
}
@defproc[(place-channel) (values place-channel? place-channel?)]{
Returns two @tech{place channels}. Data sent through the first

2
collects/setup/parallel-do.rkt
View File

@ -116,7 +116,7 @@
(define/public (spawn _id module-path funcname [initialmsg #f])
(set! id _id)
(set! pl (place (string->path module-path) funcname))
(set! pl (place-dynamic (string->path module-path) funcname))
(when initialmsg (send/msg (s-exp->fasl (serialize (initialmsg id))))))
(define/public (send/msg msg)
(DEBUG_COMM (eprintf "CSENDING ~v ~v\n" pl msg))

4
collects/tests/racket/benchmarks/places/place-channel.rkt
View File

@ -57,7 +57,7 @@
END
"pct1.ss")
(let ([pl (place "pct1.ss" 'place-main)])
(let ([pl (place-dynamic "pct1.ss" 'place-main)])
(define message-size (* 4024 1024))
(define four-k-message (make-bytes message-size 65))
(define count 150)
@ -86,7 +86,7 @@ END
END
"pct1.ss")
(let ([pl (place "pct1.ss" 'place-main)])
(let ([pl (place-dynamic "pct1.ss" 'place-main)])
(define tree (let loop ([depth 8])
(if (depth . <= . 0)
1

4
collects/tests/racket/benchmarks/places/place-launch.rkt
View File

@ -48,7 +48,7 @@ END
(let ([pls (time-n msg 0
(for/list ([i (in-range plcnt)])
(let ([p (place module-path 'place-main)])
(let ([p (place-dynamic module-path 'place-main)])
(place-channel-get p)
p)))])
(barrier-m pls)
@ -57,7 +57,7 @@ END
(let ([pls (time-n msg 1
(let ([pls (for/list ([i (in-range plcnt)])
(place module-path 'place-main))])
(place-dynamic module-path 'place-main))])
(map place-channel-get pls) pls))])
(barrier-m pls)
(places-wait pls)))

8
collects/tests/racket/benchmarks/places/place-processes.rkt
View File

@ -12,7 +12,7 @@
racket/file))
(provide
place
place-dynamic
place-wait
place-kill
place-channel-get
@ -45,7 +45,7 @@
(deserialize (fasl->s-exp (read (place-channel-s-in (resolve->channel ch))))))
;; create a place given a module file path and a func-name to invoke
(define (place module-name func-name)
(define (place-dynamic module-name func-name)
(define (send/msg x ch)
(write x ch)
(flush-output ch))
@ -133,7 +133,7 @@
(splat (syntax->datum worker-syntax) module-path)
(define place-syntax #`(place #,module-path (quote name)))
(define place-syntax #`(place-dynamic #,module-path (quote name)))
;(write (syntax->datum place-syntax))
place-syntax)]))
@ -144,7 +144,7 @@
(define (place/current-module-path funcname)
(with-syntax ([funcname funcname])
#'(let ([module-path (resolved-module-path-name (variable-reference->resolved-module-path (#%variable-reference)))])
(place module-path (quote funcname)))))
(place-dynamic module-path (quote funcname)))))
(with-syntax ([interal-def-name (syntax-local-lift-expression #'(lambda () ((lambda (args ...) body ...) (place-child-channel))))])
(syntax-local-lift-provide #'(rename interal-def-name name)))
(place/current-module-path #'name))]))

2
collects/tests/racket/benchmarks/places/place-utils.rkt
View File

@ -56,7 +56,7 @@
(splat (syntax->datum worker-syntax) module-path-str)
(define place-syntax #`(place #,module-path (quote name)))
(define place-syntax #`(place-dynamic #,module-path (quote name)))
;(write (syntax->datum place-syntax)) (newline)
place-syntax)]))

4
collects/tests/racket/benchmarks/places/symbols.rkt
View File

@ -33,7 +33,7 @@ END
[(vector) (values (processor-count) 10 1000000)]
[(vector a b c) (values a b c)]))
(define pls (for/list ([i (in-range plcnt)]) (place "pct1.ss" 'place-main)))
(define pls (for/list ([i (in-range plcnt)]) (place-dynamic "pct1.ss" 'place-main)))
(for ([i (in-range plcnt)]
[pl pls])
@ -70,7 +70,7 @@ END
(for ([j (in-range reps)])
(time-n "require-algol-parse/racket-class" j
(define pls (for/list ([i (in-range plcnt)]) (place "pct2.ss" 'place-main)))
(define pls (for/list ([i (in-range plcnt)]) (place-dynamic "pct2.ss" 'place-main)))
(barrier-m pls))))
(symbol-test)

4
collects/tests/racket/place-channel.rkt
View File

@ -143,7 +143,7 @@
(define ll (length l))
(printf "Master ~a length ~a\n" desc ll)
(define p (place/anon ch
(define p (place ch
(define l (place-channel-get ch))
(define wl (length l))
(printf "Worker length ~a\n" wl)
@ -222,7 +222,7 @@
(place-wait pl))
(let ([p (place/anon ch
(let ([p (place ch
(with-handlers ([exn:break? (lambda (x) (place-channel-put ch "OK"))])
(place-channel-put ch "ALIVE")
(sync never-evt)

6
collects/tests/racket/place.rktl
View File

@ -26,9 +26,9 @@
(arity-test place-channel-put/get 2 2)
(arity-test processor-count 0 0)
(err/rt-test (place "foo.rkt"))
(err/rt-test (place null 10))
(err/rt-test (place "foo.rkt" 10))
(err/rt-test (place-dynamic "foo.rkt"))
(err/rt-test (place-dynamic null 10))
(err/rt-test (place-dynamic "foo.rkt" 10))
(let ([p (place/base (p1 ch)
(printf "Hello form place 2\n")

2
src/racket/src/place.c
View File

@ -89,7 +89,7 @@ void scheme_init_place(Scheme_Env *env)
GLOBAL_PRIM_W_ARITY("place-enabled?", scheme_place_enabled, 0, 0, plenv);
GLOBAL_PRIM_W_ARITY("place-shared?", scheme_place_shared, 1, 1, plenv);
PLACE_PRIM_W_ARITY("place", scheme_place, 2, 2, plenv);
PLACE_PRIM_W_ARITY("place-dynamic", scheme_place, 2, 2, plenv);
PLACE_PRIM_W_ARITY("place-sleep", scheme_place_sleep, 1, 1, plenv);
PLACE_PRIM_W_ARITY("place-wait", scheme_place_wait, 1, 1, plenv);
PLACE_PRIM_W_ARITY("place-kill", scheme_place_kill, 1, 1, plenv);