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

fix place-unfriendly static in ffi

Browse Source 
Lazy initialization of statics shared across places doesn't work.
Also, each static must be registered with the GC exactly once;
I'm not sure why regstering on every callback didn't cause more
problems.
This commit is contained in:
Matthew Flatt 2011-09-08 18:26:25 -06:00
parent 68aad051e9
commit 0229e762bc
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/foreign/foreign.c
View File

@ -2796,12 +2796,13 @@ void free_fficall_data(void *ignored, void *p)
free(p);
}
static Scheme_Object *ffi_name_prefix = NULL;
/* (ffi-call ffi-obj in-types out-type [abi save-errno? orig-place?]) -> (in-types -> out-value) */
/* the real work is done by ffi_do_call above */
#define MYNAME "ffi-call"
static Scheme_Object *foreign_ffi_call(int argc, Scheme_Object *argv[])
{
static Scheme_Object *ffi_name_prefix = NULL;
Scheme_Object *itypes = argv[1];
Scheme_Object *otype = argv[2];
Scheme_Object *obj, *data, *p, *base;
@ -2816,9 +2817,6 @@ static Scheme_Object *foreign_ffi_call(int argc, Scheme_Object *argv[])
#else
# define FFI_CALL_VEC_SIZE 7
#endif
MZ_REGISTER_STATIC(ffi_name_prefix);
if (!ffi_name_prefix)
ffi_name_prefix = scheme_make_byte_string_without_copying("ffi:");
if (!SCHEME_FFIANYPTRP(argv[0]))
scheme_wrong_type(MYNAME, "ffi-obj-or-cpointer", 0, argc, argv);
obj = SCHEME_FFIANYPTR_VAL(argv[0]);
@ -3403,6 +3401,9 @@ void scheme_init_foreign_globals()
fail_ok_sym = scheme_intern_symbol("fail-ok");
MZ_REGISTER_STATIC(abs_sym);
abs_sym = scheme_intern_symbol("abs");
MZ_REGISTER_STATIC(ffi_name_prefix);
ffi_name_prefix = scheme_make_byte_string_without_copying("ffi:");
}
void scheme_init_foreign_places() {

9
src/foreign/foreign.rktc
View File

@ -2151,10 +2151,11 @@ void free_fficall_data(void *ignored, void *p)
free(p);
}
static Scheme_Object *ffi_name_prefix = NULL;
/* (ffi-call ffi-obj in-types out-type [abi save-errno? orig-place?]) -> (in-types -> out-value) */
/* the real work is done by ffi_do_call above */
@cdefine[ffi-call 3 6]{
static Scheme_Object *ffi_name_prefix = NULL;
Scheme_Object *itypes = argv[1];
Scheme_Object *otype = argv[2];
Scheme_Object *obj, *data, *p, *base;
@ -2169,9 +2170,6 @@ void free_fficall_data(void *ignored, void *p)
#else
# define FFI_CALL_VEC_SIZE 7
#endif
MZ_REGISTER_STATIC(ffi_name_prefix);
if (!ffi_name_prefix)
ffi_name_prefix = scheme_make_byte_string_without_copying("ffi:");
if (!SCHEME_FFIANYPTRP(argv[0]))
scheme_wrong_type(MYNAME, "ffi-obj-or-cpointer", 0, argc, argv);
obj = SCHEME_FFIANYPTR_VAL(argv[0]);
@ -2717,6 +2715,9 @@ void scheme_init_foreign_globals()
@list{MZ_REGISTER_STATIC(@(cadr sym));
@(cadr sym) = scheme_intern_symbol("@(car sym)")})
(reverse (symbols)))
MZ_REGISTER_STATIC(ffi_name_prefix);
ffi_name_prefix = scheme_make_byte_string_without_copying("ffi:");
}
void scheme_init_foreign_places() {