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

another futures bug fix

Browse Source
This commit is contained in:
Matthew Flatt 2011-12-02 09:41:59 -07:00
parent 58d01d0d12
commit c2fac607f0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1608,7 +1608,7 @@ static void complete_rtcall(Scheme_Future_State *fs, future_t *future)
} else { } else {
/* Signal the waiting worker thread that it /* Signal the waiting worker thread that it
can continue running machine code */ can continue running machine code */
future->want_lw = 0; future->want_lw = 0; /* needed if we get here via direct_future_to_future_touch() */
if (future->can_continue_sema) { if (future->can_continue_sema) {
mzrt_sema_post(future->can_continue_sema); mzrt_sema_post(future->can_continue_sema);
future->can_continue_sema = NULL; future->can_continue_sema = NULL;
@ -1801,6 +1801,7 @@ Scheme_Object *general_touch(int argc, Scheme_Object *argv[])
Release the lock so other threads can manipulate the queue Release the lock so other threads can manipulate the queue
while the runtime call executes. */ while the runtime call executes. */
ft->status = HANDLING_PRIM; ft->status = HANDLING_PRIM;
ft->want_lw = 0;
mzrt_mutex_unlock(fs->future_mutex); mzrt_mutex_unlock(fs->future_mutex);
LOG("Invoking primitive on behalf of future %d...", ft->id); LOG("Invoking primitive on behalf of future %d...", ft->id);
invoke_rtcall(fs, ft, 0); invoke_rtcall(fs, ft, 0);
@ -3003,6 +3004,9 @@ static void invoke_rtcall(Scheme_Future_State * volatile fs, future_t * volatile
Scheme_Thread *p = scheme_current_thread; Scheme_Thread *p = scheme_current_thread;
mz_jmp_buf newbuf, * volatile savebuf; mz_jmp_buf newbuf, * volatile savebuf;
/* future->want_lw should have been cleared (while holding the future-queue lock)
by the time we get here */
savebuf = p->error_buf; savebuf = p->error_buf;
p->error_buf = &newbuf; p->error_buf = &newbuf;
if (scheme_setjmp(newbuf)) { if (scheme_setjmp(newbuf)) {
@ -3018,7 +3022,6 @@ static void invoke_rtcall(Scheme_Future_State * volatile fs, future_t * volatile
} else { } else {
/* Signal the waiting worker thread that it /* Signal the waiting worker thread that it
can continue running machine code */ can continue running machine code */
future->want_lw = 0;
mzrt_sema_post(future->can_continue_sema); mzrt_sema_post(future->can_continue_sema);
future->can_continue_sema = NULL; future->can_continue_sema = NULL;
mzrt_mutex_unlock(fs->future_mutex); mzrt_mutex_unlock(fs->future_mutex);