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

fix futures allocation bug

Browse Source 
svn: r18426
This commit is contained in:
Matthew Flatt 2010-03-02 14:36:14 +00:00
parent 620faa9b88
commit 068dc863c4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1007,7 +1007,6 @@ unsigned long scheme_rtcall_alloc(const char *who, int src_type)
future_t *future; future_t *future;
unsigned long retval; unsigned long retval;
Scheme_Future_Thread_State *fts = scheme_future_thread_state; Scheme_Future_Thread_State *fts = scheme_future_thread_state;
Scheme_Future_State *fs = scheme_future_state;
long align; long align;
align = GC_alloc_alignment(); align = GC_alloc_alignment();
@ -1017,8 +1016,12 @@ unsigned long scheme_rtcall_alloc(const char *who, int src_type)
long cur; long cur;
cur = GC_gen0_alloc_page_ptr; cur = GC_gen0_alloc_page_ptr;
if (cur < (fts->gen0_start + (fts->gen0_size - 1) * align)) { if (cur < (fts->gen0_start + (fts->gen0_size - 1) * align)) {
cur &= ~(align - 1); if (cur & (align - 1)) {
cur += align + fts->gen0_initial_offset; /* round up to next page boundary */
cur &= ~(align - 1);
cur += align;
}
cur += fts->gen0_initial_offset;
return cur; return cur;
} }
} }
@ -1042,11 +1045,11 @@ unsigned long scheme_rtcall_alloc(const char *who, int src_type)
retval = future->alloc_retval; retval = future->alloc_retval;
future->alloc_retval = 0; future->alloc_retval = 0;
fts->gen0_start = retval; if (fts->worker_gc_counter == future->alloc_retval_counter) {
fts->gen0_initial_offset = retval & (align - 1); fts->gen0_start = retval;
fts->gen0_initial_offset = retval & (align - 1);
if (*fs->gc_counter_ptr == future->alloc_retval_counter)
break; break;
}
} }
return retval; return retval;