From 939f0b1c0b597fb9a17b106715fab956bbf86f26 Mon Sep 17 00:00:00 2001 From: Kevin Tew Date: Sat, 11 Jun 2011 15:21:57 -0600 Subject: [PATCH] rename place-dynamic to dynamic-place --- collects/racket/place.rkt | 8 ++++---- collects/scribblings/reference/places.scrbl | 4 ++-- collects/setup/parallel-do.rkt | 2 +- collects/tests/racket/benchmarks/places/place-channel.rkt | 4 ++-- collects/tests/racket/benchmarks/places/place-launch.rkt | 4 ++-- .../tests/racket/benchmarks/places/place-processes.rkt | 8 ++++---- collects/tests/racket/benchmarks/places/place-utils.rkt | 2 +- collects/tests/racket/benchmarks/places/symbols.rkt | 4 ++-- collects/tests/racket/place.rktl | 6 +++--- src/racket/src/place.c | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/collects/racket/place.rkt b/collects/racket/place.rkt index 9d263cb55e..31f247bba3 100644 --- a/collects/racket/place.rkt +++ b/collects/racket/place.rkt @@ -11,7 +11,7 @@ (for-syntax racket/base racket/syntax)) -(provide place-dynamic +(provide dynamic-place place-sleep place-wait place-kill @@ -45,7 +45,7 @@ (loop))))) ch)) -(define (th-place-dynamic mod funcname) +(define (th-dynamic-place 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) @@ -120,7 +120,7 @@ (define-syntax-rule (define-pl x p t) (define x (if (pl-place-enabled?) p t))) -(define-pl place-dynamic pl-place-dynamic th-place-dynamic) +(define-pl dynamic-place pl-dynamic-place th-dynamic-place) (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) @@ -146,7 +146,7 @@ #'(let ([module-path (resolved-module-path-name (variable-reference->resolved-module-path (#%variable-reference)))]) - (place-dynamic module-path (quote funcname))))])) + (dynamic-place module-path (quote funcname))))])) (define-syntax (place/thunk stx) (with-syntax ([create-place (gen-create-place stx)]) diff --git a/collects/scribblings/reference/places.scrbl b/collects/scribblings/reference/places.scrbl index ea12d6afc2..551109d142 100644 --- a/collects/scribblings/reference/places.scrbl +++ b/collects/scribblings/reference/places.scrbl @@ -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-dynamic "place-worker.rkt" 'place-main))]) + (dynamic-place "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-dynamic [module-path module-path?] [start-proc symbol?]) place?]{ +@defproc[(dynamic-place [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 diff --git a/collects/setup/parallel-do.rkt b/collects/setup/parallel-do.rkt index ff2f6e0c99..74c017e8f7 100644 --- a/collects/setup/parallel-do.rkt +++ b/collects/setup/parallel-do.rkt @@ -116,7 +116,7 @@ (define/public (spawn _id module-path funcname [initialmsg #f]) (set! id _id) - (set! pl (place-dynamic (string->path module-path) funcname)) + (set! pl (dynamic-place (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)) diff --git a/collects/tests/racket/benchmarks/places/place-channel.rkt b/collects/tests/racket/benchmarks/places/place-channel.rkt index f5824df2c7..ceb44f4b2c 100644 --- a/collects/tests/racket/benchmarks/places/place-channel.rkt +++ b/collects/tests/racket/benchmarks/places/place-channel.rkt @@ -57,7 +57,7 @@ END "pct1.ss") - (let ([pl (place-dynamic "pct1.ss" 'place-main)]) + (let ([pl (dynamic-place "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-dynamic "pct1.ss" 'place-main)]) + (let ([pl (dynamic-place "pct1.ss" 'place-main)]) (define tree (let loop ([depth 8]) (if (depth . <= . 0) 1 diff --git a/collects/tests/racket/benchmarks/places/place-launch.rkt b/collects/tests/racket/benchmarks/places/place-launch.rkt index 3884dc6763..caeae3f557 100644 --- a/collects/tests/racket/benchmarks/places/place-launch.rkt +++ b/collects/tests/racket/benchmarks/places/place-launch.rkt @@ -48,7 +48,7 @@ END (let ([pls (time-n msg 0 (for/list ([i (in-range plcnt)]) - (let ([p (place-dynamic module-path 'place-main)]) + (let ([p (dynamic-place 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-dynamic module-path 'place-main))]) + (dynamic-place module-path 'place-main))]) (map place-channel-get pls) pls))]) (barrier-m pls) (places-wait pls))) diff --git a/collects/tests/racket/benchmarks/places/place-processes.rkt b/collects/tests/racket/benchmarks/places/place-processes.rkt index aa468254a0..1d2f0c3a50 100644 --- a/collects/tests/racket/benchmarks/places/place-processes.rkt +++ b/collects/tests/racket/benchmarks/places/place-processes.rkt @@ -12,7 +12,7 @@ racket/file)) (provide - place-dynamic + dynamic-place 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-dynamic module-name func-name) +(define (dynamic-place 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-dynamic #,module-path (quote name))) + (define place-syntax #`(dynamic-place #,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-dynamic module-path (quote funcname))))) + (dynamic-place 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))])) diff --git a/collects/tests/racket/benchmarks/places/place-utils.rkt b/collects/tests/racket/benchmarks/places/place-utils.rkt index d091525366..b4a5412972 100644 --- a/collects/tests/racket/benchmarks/places/place-utils.rkt +++ b/collects/tests/racket/benchmarks/places/place-utils.rkt @@ -56,7 +56,7 @@ (splat (syntax->datum worker-syntax) module-path-str) - (define place-syntax #`(place-dynamic #,module-path (quote name))) + (define place-syntax #`(dynamic-place #,module-path (quote name))) ;(write (syntax->datum place-syntax)) (newline) place-syntax)])) diff --git a/collects/tests/racket/benchmarks/places/symbols.rkt b/collects/tests/racket/benchmarks/places/symbols.rkt index 9269a24e7b..57740c474a 100644 --- a/collects/tests/racket/benchmarks/places/symbols.rkt +++ b/collects/tests/racket/benchmarks/places/symbols.rkt @@ -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-dynamic "pct1.ss" 'place-main))) + (define pls (for/list ([i (in-range plcnt)]) (dynamic-place "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-dynamic "pct2.ss" 'place-main))) + (define pls (for/list ([i (in-range plcnt)]) (dynamic-place "pct2.ss" 'place-main))) (barrier-m pls)))) (symbol-test) diff --git a/collects/tests/racket/place.rktl b/collects/tests/racket/place.rktl index 5cb478ba82..adc9844209 100644 --- a/collects/tests/racket/place.rktl +++ b/collects/tests/racket/place.rktl @@ -26,9 +26,9 @@ (arity-test place-channel-put/get 2 2) (arity-test processor-count 0 0) -(err/rt-test (place-dynamic "foo.rkt")) -(err/rt-test (place-dynamic null 10)) -(err/rt-test (place-dynamic "foo.rkt" 10)) +(err/rt-test (dynamic-place "foo.rkt")) +(err/rt-test (dynamic-place null 10)) +(err/rt-test (dynamic-place "foo.rkt" 10)) (let ([p (place/base (p1 ch) (printf "Hello form place 2\n") diff --git a/src/racket/src/place.c b/src/racket/src/place.c index b90a3abbec..0c4687f579 100644 --- a/src/racket/src/place.c +++ b/src/racket/src/place.c @@ -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-dynamic", scheme_place, 2, 2, plenv); + PLACE_PRIM_W_ARITY("dynamic-place", 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);