From deb0a8c26e2eec7374e4b65de24c1e8e53c1de03 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Thu, 18 Jul 2013 14:10:54 -0400 Subject: [PATCH] Move distributed places to their own package. --- pkgs/distributed-places-lib/info.rkt | 3 +++ .../racket/place/define-remote-server.rkt | 0 .../distributed-places-lib}/racket/place/distributed.rkt | 0 .../racket/place/distributed/examples/hello-world.rkt | 0 .../racket/place/distributed/examples/logging/bank.rkt | 0 .../racket/place/distributed/examples/logging/master.rkt | 0 .../racket/place/distributed/examples/logging/tuple.rkt | 0 .../racket/place/distributed/examples/multiple/bank.rkt | 0 .../racket/place/distributed/examples/multiple/master.rkt | 0 .../place/distributed/examples/multiple/place-worker.rkt | 0 .../racket/place/distributed/examples/named/bank.rkt | 0 .../racket/place/distributed/examples/named/master.rkt | 0 .../racket/place/distributed/examples/named/tuple.rkt | 0 .../racket/place/distributed/examples/restart/master.rkt | 0 .../racket/place/distributed/examples/restart/restarter.rkt | 0 .../racket/place/distributed/examples/thread/master.rkt | 0 .../racket/place/distributed/info.rkt | 0 .../racket/place/distributed/launch.rkt | 0 .../racket/place/distributed/map-reduce.rkt | 0 .../racket/place/distributed/rmpi.rkt | 0 pkgs/racket-pkgs/racket-doc/info.rkt | 1 + pkgs/racket-pkgs/racket-test/info.rkt | 1 + racket/lib/collects/racket/place.rkt | 6 +++++- 23 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 pkgs/distributed-places-lib/info.rkt rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/define-remote-server.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/hello-world.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/logging/bank.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/logging/master.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/logging/tuple.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/multiple/bank.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/multiple/master.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/multiple/place-worker.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/named/bank.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/named/master.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/named/tuple.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/restart/master.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/restart/restarter.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/examples/thread/master.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/info.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/launch.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/map-reduce.rkt (100%) rename {racket/lib/collects => pkgs/distributed-places-lib}/racket/place/distributed/rmpi.rkt (100%) diff --git a/pkgs/distributed-places-lib/info.rkt b/pkgs/distributed-places-lib/info.rkt new file mode 100644 index 0000000000..c412ec2805 --- /dev/null +++ b/pkgs/distributed-places-lib/info.rkt @@ -0,0 +1,3 @@ +#lang info +(define collection 'multi) +(define deps '("base")) diff --git a/racket/lib/collects/racket/place/define-remote-server.rkt b/pkgs/distributed-places-lib/racket/place/define-remote-server.rkt similarity index 100% rename from racket/lib/collects/racket/place/define-remote-server.rkt rename to pkgs/distributed-places-lib/racket/place/define-remote-server.rkt diff --git a/racket/lib/collects/racket/place/distributed.rkt b/pkgs/distributed-places-lib/racket/place/distributed.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed.rkt rename to pkgs/distributed-places-lib/racket/place/distributed.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/hello-world.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/hello-world.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/hello-world.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/hello-world.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/logging/bank.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/logging/bank.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/logging/bank.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/logging/bank.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/logging/master.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/logging/master.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/logging/master.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/logging/master.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/logging/tuple.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/logging/tuple.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/logging/tuple.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/logging/tuple.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/multiple/bank.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/bank.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/multiple/bank.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/bank.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/multiple/master.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/master.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/multiple/master.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/master.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/multiple/place-worker.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/place-worker.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/multiple/place-worker.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/place-worker.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/named/bank.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/named/bank.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/named/bank.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/named/bank.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/named/master.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/named/master.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/named/master.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/named/master.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/named/tuple.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/named/tuple.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/named/tuple.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/named/tuple.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/restart/master.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/restart/master.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/restart/master.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/restart/master.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/restart/restarter.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/restart/restarter.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/restart/restarter.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/restart/restarter.rkt diff --git a/racket/lib/collects/racket/place/distributed/examples/thread/master.rkt b/pkgs/distributed-places-lib/racket/place/distributed/examples/thread/master.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/examples/thread/master.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/examples/thread/master.rkt diff --git a/racket/lib/collects/racket/place/distributed/info.rkt b/pkgs/distributed-places-lib/racket/place/distributed/info.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/info.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/info.rkt diff --git a/racket/lib/collects/racket/place/distributed/launch.rkt b/pkgs/distributed-places-lib/racket/place/distributed/launch.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/launch.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/launch.rkt diff --git a/racket/lib/collects/racket/place/distributed/map-reduce.rkt b/pkgs/distributed-places-lib/racket/place/distributed/map-reduce.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/map-reduce.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/map-reduce.rkt diff --git a/racket/lib/collects/racket/place/distributed/rmpi.rkt b/pkgs/distributed-places-lib/racket/place/distributed/rmpi.rkt similarity index 100% rename from racket/lib/collects/racket/place/distributed/rmpi.rkt rename to pkgs/distributed-places-lib/racket/place/distributed/rmpi.rkt diff --git a/pkgs/racket-pkgs/racket-doc/info.rkt b/pkgs/racket-pkgs/racket-doc/info.rkt index e8f51f3e45..73914f11ef 100644 --- a/pkgs/racket-pkgs/racket-doc/info.rkt +++ b/pkgs/racket-pkgs/racket-doc/info.rkt @@ -6,6 +6,7 @@ "planet-lib" "compatibility-lib" "net-lib" + "distributed-places-lib" "sandbox-lib" "compiler-lib" "scribble-lib" diff --git a/pkgs/racket-pkgs/racket-test/info.rkt b/pkgs/racket-pkgs/racket-test/info.rkt index dc8988e0ad..9f749d905b 100644 --- a/pkgs/racket-pkgs/racket-test/info.rkt +++ b/pkgs/racket-pkgs/racket-test/info.rkt @@ -8,6 +8,7 @@ "sandbox-lib" "compatibility-lib" "planet-lib" + "distributed-places-lib" "pconvert-lib" "eli-tester" ;; for `net` tests diff --git a/racket/lib/collects/racket/place.rkt b/racket/lib/collects/racket/place.rkt index 2d02af3eec..056ec3d1de 100644 --- a/racket/lib/collects/racket/place.rkt +++ b/racket/lib/collects/racket/place.rkt @@ -81,7 +81,11 @@ (define (dynamic-place module-path function #:at [node #f] #:named [named #f]) (cond [node - (supervise-place-at node module-path function #:named named)] + (unless (collection-file-path "distributed.rkt" "racket" "place" + #:fail (lambda (x) #f)) + (raise-arguments-error "dynamic-place" + "distributed places are not available")) + (supervise-place-at node module-path function #:named named)] [else (start-place 'dynamic-place module-path function #f (current-output-port) (current-error-port))]))