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

fix problems with `would-be-future'

Browse Source
This commit is contained in:
Matthew Flatt 2012-10-30 17:28:37 -06:00
parent 8aee78a4bb
commit 8fab527ce3
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collects/tests/future/future.rkt
View File

@ -635,7 +635,7 @@ We should also test deep continuations.
(fsemaphore-wait m)))]
[f2 (func (λ ()
(let* ([lst '()]
[retval (let loop ([index 10000] [l lst])
[retval (let loop ([index 100000] [l lst])
(cond
[(zero? index) l]
[else

22
src/racket/src/future.c
View File

@ -582,6 +582,12 @@ void scheme_init_futures_per_place()
futures_init();
}
static Scheme_Object *set_fts_thread(Scheme_Object *ignored)
{
scheme_future_thread_state->thread = scheme_current_thread;
return ignored;
}
void futures_init(void)
{
Scheme_Future_State *fs;
@ -607,7 +613,8 @@ void futures_init(void)
rt_fts->is_runtime_thread = 1;
rt_fts->gen0_size = 1;
scheme_future_thread_state = rt_fts;
rt_fts->thread = scheme_current_thread;
scheme_add_swap_callback(set_fts_thread, scheme_false);
set_fts_thread(scheme_false);
REGISTER_SO(fs->future_queue);
REGISTER_SO(fs->future_queue_end);
@ -957,6 +964,12 @@ void scheme_future_check_custodians()
scheme_future_continue_after_gc();
}
int scheme_future_is_runtime_thread()
{
Scheme_Future_Thread_State *fts = scheme_future_thread_state;
return fts->is_runtime_thread;
}
/**********************************************************************/
/* Future-event logging */
/**********************************************************************/
@ -1420,8 +1433,7 @@ static void run_would_be_future(future_t *ft)
fts = scheme_future_thread_state;
/* Setup the future thread state */
fts->thread = p;
fts->thread->futures_slow_path_tracing++;
p->futures_slow_path_tracing++;
scheme_use_rtcall++;
savebuf = p->error_buf;
@ -1435,7 +1447,7 @@ static void run_would_be_future(future_t *ft)
}
scheme_use_rtcall--;
fts->thread->futures_slow_path_tracing--;
p->futures_slow_path_tracing--;
ft->in_tracing_mode = 0;
p->error_buf = savebuf;
@ -3590,7 +3602,7 @@ static void do_invoke_rtcall(Scheme_Future_State *fs, future_t *future)
retval = _scheme_apply(arg_s0, future->arg_i0, arg_S0);
future->retval_s = retval;
send_special_result(future, retval);
send_special_result(future, retval);
break;
}

1
src/racket/src/future.h
View File

@ -268,6 +268,7 @@ void scheme_future_continue_after_gc();
void scheme_check_future_work();
void scheme_future_gc_pause();
void scheme_future_check_custodians();
int scheme_future_is_runtime_thread();
#endif /* MZ_USE_FUTURES */

5
src/racket/src/jitcall.c
View File

@ -157,7 +157,10 @@ static Scheme_Object *ts__scheme_tail_apply_from_native(Scheme_Object *rator, in
/* try thread-local allocation: */
Scheme_Object **a;
#ifdef MZ_PRECISE_GC
a = MALLOC_N(Scheme_Object *, argc);
if (scheme_future_is_runtime_thread())
a = NULL;
else
a = MALLOC_N(Scheme_Object *, argc);
#else
a = NULL; /* future-local allocation is not supported */
#endif