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

Finish load_extension places FIXME_LATER

Browse Source
This commit is contained in:
Kevin Tew 2011-04-24 20:05:41 -06:00
parent 44bf21a907
commit 2c02d9ff8d
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/racket/src/dynext.c
View File

@ -105,9 +105,8 @@ Scheme_Extension_Table *scheme_extension_table;
#endif #endif
#ifndef NO_DYNAMIC_LOAD #ifndef NO_DYNAMIC_LOAD
/* FIXME disallow extensions under places */ SHARED_OK static Scheme_Hash_Table *loaded_extensions; /* hash on scheme_initialize pointer */
FIXME_LATER static Scheme_Hash_Table *loaded_extensions; /* hash on scheme_initialize pointer */ SHARED_OK static Scheme_Hash_Table *fullpath_loaded_extensions; /* hash on full path name */
FIXME_LATER static Scheme_Hash_Table *fullpath_loaded_extensions; /* hash on full path name */
#endif #endif
#ifdef MZ_PRECISE_GC #ifdef MZ_PRECISE_GC
@ -190,6 +189,9 @@ static Scheme_Object *do_load_extension(const char *filename,
ExtensionData *ed; ExtensionData *ed;
void *handle; void *handle;
int comppath; int comppath;
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
void *original_gc;
# endif
comppath = scheme_is_complete_path(filename, strlen(filename), SCHEME_PLATFORM_PATH_KIND); comppath = scheme_is_complete_path(filename, strlen(filename), SCHEME_PLATFORM_PATH_KIND);
@ -197,11 +199,21 @@ static Scheme_Object *do_load_extension(const char *filename,
modname_f = NULL; modname_f = NULL;
handle = NULL; handle = NULL;
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
original_gc = GC_switch_to_master_gc();
scheme_start_atomic();
# endif
if (comppath) if (comppath)
init_f = (Init_Procedure)scheme_hash_get(fullpath_loaded_extensions, (Scheme_Object *)filename); init_f = (Init_Procedure)scheme_hash_get(fullpath_loaded_extensions, (Scheme_Object *)filename);
else else
init_f = NULL; init_f = NULL;
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
scheme_end_atomic_no_swap();
GC_switch_back_from_master(original_gc);
# endif
if (!init_f) { if (!init_f) {
#endif #endif
@ -216,19 +228,9 @@ static Scheme_Object *do_load_extension(const char *filename,
if (filename[0] != '/') { if (filename[0] != '/') {
int l = strlen(filename); int l = strlen(filename);
char *s; char *s;
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
void *original_gc;
original_gc = GC_switch_to_master_gc();
scheme_start_atomic();
# endif
s = (char *)scheme_malloc_atomic(l + 3); s = (char *)scheme_malloc_atomic(l + 3);
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
scheme_end_atomic_no_swap();
GC_switch_back_from_master(original_gc);
# endif
s[0] = '.'; s[0] = '.';
s[1] = '/'; s[1] = '/';
memcpy(s + 2, filename, l + 1); memcpy(s + 2, filename, l + 1);
@ -352,6 +354,9 @@ static Scheme_Object *do_load_extension(const char *filename,
Setup_Procedure f; Setup_Procedure f;
char *vers; char *vers;
CFragConnectionID connID; CFragConnectionID connID;
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
void *original_gc;
# endif
if (get_ext_file_spec( &spec, filename ) && load_ext_file_spec( &spec, &connID ) ) if (get_ext_file_spec( &spec, filename ) && load_ext_file_spec( &spec, &connID ) )
{ {
@ -410,11 +415,12 @@ static Scheme_Object *do_load_extension(const char *filename,
if (comppath) { if (comppath) {
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC) # if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
void *original_gc;
original_gc = GC_switch_to_master_gc(); original_gc = GC_switch_to_master_gc();
scheme_start_atomic(); scheme_start_atomic();
filename = scheme_strdup(filename);
# endif # endif
scheme_hash_set(fullpath_loaded_extensions, (Scheme_Object *)filename, mzPROC_TO_HASH_OBJ(init_f)); scheme_hash_set(fullpath_loaded_extensions, (Scheme_Object *)filename, mzPROC_TO_HASH_OBJ(init_f));
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC) # if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
@ -433,7 +439,6 @@ static Scheme_Object *do_load_extension(const char *filename,
modname_f = ed->modname_f; modname_f = ed->modname_f;
} else { } else {
# if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC) # if defined(MZ_USE_PLACES) && defined(MZ_PRECISE_GC)
void *original_gc;
original_gc = GC_switch_to_master_gc(); original_gc = GC_switch_to_master_gc();
scheme_start_atomic(); scheme_start_atomic();
# endif # endif