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

cs: switch to __collect_safe

Browse Source 
Sync with current ChezScheme (plus PRs), which involves changing
`__thread` FFI directives to `__collect_safe`.
This commit is contained in:
Matthew Flatt 2018-07-16 19:56:55 -06:00
parent bfa08e40b1
commit d67cec6892
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/base/info.rkt
View File

@ -12,7 +12,7 @@
(define collection 'multi) (define collection 'multi)
(define version "7.0.0.6") (define version "7.0.0.7")
(define deps `("racket-lib" (define deps `("racket-lib"
["racket" #:version ,version])) ["racket" #:version ,version]))

2
racket/src/cs/compile-file.ss
View File

@ -16,7 +16,7 @@
(check-defined 'current-generate-id) (check-defined 'current-generate-id)
(check-defined 'load-compiled-from-port) (check-defined 'load-compiled-from-port)
(check-defined 'collect-rendezvous) (check-defined 'collect-rendezvous)
(check-defined '(define-ftype T (function __thread () void))) (check-defined '(define-ftype T (function __collect_safe () void)))
;; ---------------------------------------- ;; ----------------------------------------

2
racket/src/cs/io.sls
View File

@ -114,7 +114,7 @@
(with-syntax ([ret-type (convert-type #'orig-ret-type)] (with-syntax ([ret-type (convert-type #'orig-ret-type)]
[(arg-type ...) (map convert-type #'(orig-arg-type ...))] [(arg-type ...) (map convert-type #'(orig-arg-type ...))]
[(conv ...) (if (#%memq 'blocking (map syntax->datum #'(flag ...))) [(conv ...) (if (#%memq 'blocking (map syntax->datum #'(flag ...)))
#'(__thread) #'(__collect_safe)
#'())]) #'())])
#'(let ([proc (foreign-procedure conv ... (rktio-lookup 'name) #'(let ([proc (foreign-procedure conv ... (rktio-lookup 'name)
(arg-type ...) (arg-type ...)

2
racket/src/cs/rumble/foreign.ss
View File

@ -1380,7 +1380,7 @@
(lambda (to-wrap) (lambda (to-wrap)
(,(if call? 'foreign-procedure 'foreign-callable) (,(if call? 'foreign-procedure 'foreign-callable)
,conv ,conv
,@(if (or blocking? async-apply) '(__thread) '()) ,@(if (or blocking? async-apply) '(__collect_safe) '())
to-wrap to-wrap
,(map (lambda (in-type id) ,(map (lambda (in-type id)
(if id (if id

4
racket/src/racket/src/schvers.h
View File

@ -13,12 +13,12 @@
consistently.) consistently.)
*/ */
#define MZSCHEME_VERSION "7.0.0.6" #define MZSCHEME_VERSION "7.0.0.7"
#define MZSCHEME_VERSION_X 7 #define MZSCHEME_VERSION_X 7
#define MZSCHEME_VERSION_Y 0 #define MZSCHEME_VERSION_Y 0
#define MZSCHEME_VERSION_Z 0 #define MZSCHEME_VERSION_Z 0
#define MZSCHEME_VERSION_W 6 #define MZSCHEME_VERSION_W 7
#define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y) #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
#define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W) #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)