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

fix name collision with Linux+mred+futures

Browse Source 
svn: r18399
This commit is contained in:
Matthew Flatt 2010-02-28 22:43:41 +00:00
parent baf34c0194
commit 9b6ccb1476
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mzscheme/gc2/newgc.c
View File

@ -136,8 +136,8 @@ static void marking_rmp_debug(NewGC *gc, void *info);
THREAD_LOCAL_DECL(static NewGC *GC);
#define GCTYPE NewGC
#define GC_get_GC() (GC)
#define GC_set_GC(gc) (GC = gc)
#define GC_get_GC() (GC_instance)
#define GC_set_GC(gc) (GC_instance = gc)
#include "msgprint.c"
@ -3186,7 +3186,7 @@ static void repair_heap(NewGC *gc)
static inline void gen1_free_mpage(PageMap pagemap, mpage *page) {
pagemap_remove(pagemap, page);
free_backtrace(page);
free_pages(GC, page->addr, real_page_size(page));
free_pages(GC_instance, page->addr, real_page_size(page));
free_mpage(page);
}

4
src/mzscheme/include/schthread.h
View File

@ -105,7 +105,7 @@ typedef long objhead;
typedef struct Thread_Local_Variables {
void **GC_variable_stack_;
struct NewGC *GC_;
struct NewGC *GC_instance_;
unsigned long GC_gen0_alloc_page_ptr_;
unsigned long GC_gen0_alloc_page_end_;
void *bignum_cache_[BIGNUM_CACHE_SIZE];
@ -387,7 +387,7 @@ XFORM_GC_VARIABLE_STACK_THROUGH_THREAD_LOCAL;
#endif
#define GC_objhead_template XOA (scheme_get_thread_local_variables()->GC_objhead_template_)
#define GC XOA (scheme_get_thread_local_variables()->GC_)
#define GC_instance XOA (scheme_get_thread_local_variables()->GC_instance_)
#define GC_gen0_alloc_page_ptr XOA (scheme_get_thread_local_variables()->GC_gen0_alloc_page_ptr_)
#define GC_gen0_alloc_page_end XOA (scheme_get_thread_local_variables()->GC_gen0_alloc_page_end_)
#define GC_variable_stack XOA (scheme_get_thread_local_variables()->GC_variable_stack_)

4
src/mzscheme/src/future.c
View File

@ -385,7 +385,7 @@ static void init_future_thread(Scheme_Future_State *fs, int i)
memset(fts, 0, sizeof(Scheme_Future_Thread_State));
fts->id = i;
params.shared_GC = GC;
params.shared_GC = GC_instance;
params.fts = fts;
params.fs = fs;
@ -776,7 +776,7 @@ void *worker_thread_future_loop(void *arg)
scheme_future_state = fs;
scheme_future_thread_state = fts;
GC = params->shared_GC;
GC_instance = params->shared_GC;
scheme_current_thread = params->thread_skeleton;
//Set processor affinity

2
src/mzscheme/src/mzrt.h
View File

@ -184,7 +184,7 @@ static MZ_INLINE void mzrt_ensure_max_cas(unsigned long *atomic_val, unsigned lo
while(!set) {
unsigned long old_val = *atomic_val;
if (len > old_val) {
set = !mzrt_cas(atomic_val, old_val, len);
set = !mzrt_cas((size_t *)atomic_val, old_val, len);
}
else {
set = 1;