diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt index d98699f47d..5677987d83 100644 --- a/pkgs/base/info.rkt +++ b/pkgs/base/info.rkt @@ -12,7 +12,7 @@ (define collection 'multi) -(define version "7.0.0.17") +(define version "7.0.0.18") (define deps `("racket-lib" ["racket" #:version ,version])) diff --git a/racket/collects/racket/place.rkt b/racket/collects/racket/place.rkt index a8b60dc531..1a6bdb7762 100644 --- a/racket/collects/racket/place.rkt +++ b/racket/collects/racket/place.rkt @@ -20,7 +20,6 @@ (provide (protect-out dynamic-place dynamic-place*) - place-sleep place-wait place-kill (rename-out [place-break/opt place-break]) @@ -58,7 +57,6 @@ (define place-channel (if (pl-place-enabled?) pl-place-channel th-place-channel)) -(define-pl-func place-sleep p) (define-pl-func place-wait p) (define-pl-func place-kill p) (define-pl-func place-break p kind) diff --git a/racket/collects/racket/place/private/th-place.rkt b/racket/collects/racket/place/private/th-place.rkt index ea1117de21..7dfa30ff6d 100644 --- a/racket/collects/racket/place/private/th-place.rkt +++ b/racket/collects/racket/place/private/th-place.rkt @@ -12,7 +12,6 @@ (provide th-dynamic-place ;th-dynamic-place* - th-place-sleep th-place-wait th-place-kill th-place-break @@ -80,7 +79,6 @@ (thread (lambda () (thread-wait th) (custodian-shutdown-all cust)))) (TH-place th pch cust cust-box result-box)) -(define (th-place-sleep n) (sleep n)) (define (th-place-wait pl) (sync (TH-place-cust-box pl)) (unbox (TH-place-result-box pl))) (define (th-place-kill pl) (set-box! (TH-place-result-box pl) 1) (custodian-shutdown-all (TH-place-cust pl))) (define (th-place-break pl kind) (break-thread (TH-place-th pl) kind)) diff --git a/racket/src/cs/primitive/place.ss b/racket/src/cs/primitive/place.ss index bf23f98eb4..7f15dc30cb 100644 --- a/racket/src/cs/primitive/place.ss +++ b/racket/src/cs/primitive/place.ss @@ -12,6 +12,5 @@ [place-message-allowed? (known-procedure 2)] [place-pumper-threads (known-procedure 6)] [place-shared? (known-procedure 2)] - [place-sleep (known-procedure 2)] [place-wait (known-procedure 2)] [place? (known-procedure 2)]) diff --git a/racket/src/racket/src/place.c b/racket/src/racket/src/place.c index 1a54f4eddf..bcb9cbfa5d 100644 --- a/racket/src/racket/src/place.c +++ b/racket/src/racket/src/place.c @@ -50,7 +50,6 @@ static Scheme_Object *place_pumper_threads(int argc, Scheme_Object *args[]); static Scheme_Object *place_wait(int argc, Scheme_Object *args[]); static Scheme_Object *place_kill(int argc, Scheme_Object *args[]); static Scheme_Object *place_break(int argc, Scheme_Object *args[]); -static Scheme_Object *place_sleep(int argc, Scheme_Object *args[]); static Scheme_Object *place_p(int argc, Scheme_Object *args[]); static Scheme_Object *place_send(int argc, Scheme_Object *args[]); static Scheme_Object *place_receive(int argc, Scheme_Object *args[]); @@ -138,7 +137,6 @@ void scheme_init_place(Scheme_Startup_Env *env) ADD_PRIM_W_ARITY("place-shared?", scheme_place_shared, 1, 1, env); PLACE_PRIM_W_ARITY("dynamic-place", scheme_place, 5, 5, env); PLACE_PRIM_W_ARITY("place-pumper-threads", place_pumper_threads, 1, 2, env); - PLACE_PRIM_W_ARITY("place-sleep", place_sleep, 1, 1, env); PLACE_PRIM_W_ARITY("place-wait", place_wait, 1, 1, env); PLACE_PRIM_W_ARITY("place-kill", place_kill, 1, 1, env); PLACE_PRIM_W_ARITY("place-break", place_break, 1, 2, env); @@ -236,11 +234,6 @@ static void null_out_runtime_globals() { scheme_current_cont_mark_pos = 0; } -Scheme_Object *place_sleep(int argc, Scheme_Object *args[]) { - mzrt_sleep(SCHEME_INT_VAL(args[0])); - return scheme_void; -} - Scheme_Object *scheme_make_place_object() { Scheme_Place_Object *place_obj; place_obj = GC_master_malloc_tagged(sizeof(Scheme_Place_Object)); diff --git a/racket/src/racket/src/schminc.h b/racket/src/racket/src/schminc.h index 57fbfca146..3cf3764601 100644 --- a/racket/src/racket/src/schminc.h +++ b/racket/src/racket/src/schminc.h @@ -14,7 +14,7 @@ #define USE_COMPILED_STARTUP 1 -#define EXPECTED_PRIM_COUNT 1450 +#define EXPECTED_PRIM_COUNT 1449 #ifdef MZSCHEME_SOMETHING_OMITTED # undef USE_COMPILED_STARTUP diff --git a/racket/src/racket/src/schvers.h b/racket/src/racket/src/schvers.h index af8b4f1165..edbdae656c 100644 --- a/racket/src/racket/src/schvers.h +++ b/racket/src/racket/src/schvers.h @@ -13,12 +13,12 @@ consistently.) */ -#define MZSCHEME_VERSION "7.0.0.17" +#define MZSCHEME_VERSION "7.0.0.18" #define MZSCHEME_VERSION_X 7 #define MZSCHEME_VERSION_Y 0 #define MZSCHEME_VERSION_Z 0 -#define MZSCHEME_VERSION_W 17 +#define MZSCHEME_VERSION_W 18 #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y) #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W) diff --git a/racket/src/thread/main.rkt b/racket/src/thread/main.rkt index 1bd2bda4e7..e23945e2d5 100644 --- a/racket/src/thread/main.rkt +++ b/racket/src/thread/main.rkt @@ -164,7 +164,6 @@ place-kill place-wait place-dead-evt - place-sleep place-channel place-channel? diff --git a/racket/src/thread/place.rkt b/racket/src/thread/place.rkt index 3a55eced09..e1848d71a2 100644 --- a/racket/src/thread/place.rkt +++ b/racket/src/thread/place.rkt @@ -21,7 +21,6 @@ place-kill place-wait place-dead-evt - place-sleep place-channel place-channel? @@ -198,9 +197,6 @@ (check who place? p) (place-done-evt p #f)) -(define/who (place-sleep msecs) - (void)) - ;; ---------------------------------------- (struct pchannel ()