From 7514f8c28cf97e01ee27c188584d5c60d46385ee Mon Sep 17 00:00:00 2001 From: Kevin Tew Date: Mon, 29 Jun 2009 22:08:49 +0000 Subject: [PATCH] More THREAD_LOCAL annotations svn: r15329 --- src/mzscheme/src/bignum.c | 4 ++-- src/mzscheme/src/module.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mzscheme/src/bignum.c b/src/mzscheme/src/bignum.c index eec7d91266..1125081816 100644 --- a/src/mzscheme/src/bignum.c +++ b/src/mzscheme/src/bignum.c @@ -112,8 +112,8 @@ static Scheme_Object *bignum_one; extern void GC_check(void *p); #define BIGNUM_CACHE_SIZE 16 -static void *bignum_cache[BIGNUM_CACHE_SIZE]; -static int cache_count; +static THREAD_LOCAL void *bignum_cache[BIGNUM_CACHE_SIZE]; +static THREAD_LOCAL int cache_count; static void *copy_to_protected(void *p, long len, int zero) { diff --git a/src/mzscheme/src/module.c b/src/mzscheme/src/module.c index 680aede755..11a44f0649 100644 --- a/src/mzscheme/src/module.c +++ b/src/mzscheme/src/module.c @@ -195,7 +195,7 @@ static Scheme_Bucket_Table *initial_toplevel; static Scheme_Object *empty_self_modidx; static Scheme_Object *empty_self_modname; -static Scheme_Bucket_Table *starts_table; +static THREAD_LOCAL Scheme_Bucket_Table *starts_table; /* caches */ static THREAD_LOCAL Scheme_Modidx *modidx_caching_chain; @@ -370,9 +370,6 @@ void scheme_init_module(Scheme_Env *env) GLOBAL_PRIM_W_ARITY("module->namespace", module_to_namespace, 1, 1, env); GLOBAL_PRIM_W_ARITY("module->language-info", module_to_lang_info, 1, 1, env); GLOBAL_PRIM_W_ARITY("module-path?", is_module_path, 1, 1, env); - - REGISTER_SO(starts_table); - starts_table = scheme_make_weak_equal_table(); } void scheme_init_module_resolver(void) @@ -380,6 +377,9 @@ void scheme_init_module_resolver(void) Scheme_Object *o; Scheme_Config *config; + REGISTER_SO(starts_table); + starts_table = scheme_make_weak_equal_table(); + config = scheme_current_config(); o = scheme_make_prim_w_arity(default_module_resolver,