Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 21:59:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing bug in scheduler queueing paused threads

Browse source
This commit is contained in:
Alex Shinn 2012-09-16 15:08:19 +09:00
parent fcaa906954
commit 21d4fc670c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/srfi/18/threads.c
View file

@ -528,10 +528,13 @@ sexp sexp_scheduler (sexp ctx, sexp self, sexp_sint_t n, sexp root_thread) {
if (sexp_pairp(front)) { if (sexp_pairp(front)) {
res = sexp_car(front); res = sexp_car(front);
if ((sexp_context_refuel(ctx) <= 0) || sexp_context_waitp(ctx)) { if ((sexp_context_refuel(ctx) <= 0) || sexp_context_waitp(ctx)) {
/* either terminated or paused */ /* orig ctx is either terminated or paused */
sexp_global(ctx, SEXP_G_THREADS_FRONT) = sexp_cdr(front); sexp_global(ctx, SEXP_G_THREADS_FRONT) = sexp_cdr(front);
if (! sexp_pairp(sexp_cdr(front))) if (! sexp_pairp(sexp_cdr(front)))
sexp_global(ctx, SEXP_G_THREADS_BACK) = SEXP_NULL; sexp_global(ctx, SEXP_G_THREADS_BACK) = SEXP_NULL;
if (sexp_context_refuel(ctx) > 0 && sexp_not(sexp_memq(ctx, ctx, paused)))
sexp_insert_timed(ctx, ctx, SEXP_FALSE);
paused = sexp_global(res, SEXP_G_THREADS_PAUSED);
} else { } else {
/* swap with front of queue */ /* swap with front of queue */
sexp_car(sexp_global(ctx, SEXP_G_THREADS_FRONT)) = ctx; sexp_car(sexp_global(ctx, SEXP_G_THREADS_FRONT)) = ctx;
@ -565,12 +568,13 @@ sexp sexp_scheduler (sexp ctx, sexp self, sexp_sint_t n, sexp root_thread) {
&& sexp_context_before(sexp_car(paused), sexp_context_timeval(res))) { && sexp_context_before(sexp_car(paused), sexp_context_timeval(res))) {
tmp = res; tmp = res;
res = sexp_car(paused); res = sexp_car(paused);
sexp_global(ctx, SEXP_G_THREADS_PAUSED) = sexp_cdr(paused); paused = sexp_global(ctx, SEXP_G_THREADS_PAUSED) = sexp_cdr(paused);
if (sexp_not(sexp_memq(ctx, tmp, paused))) if (sexp_not(sexp_memq(ctx, tmp, paused)))
sexp_insert_timed(ctx, tmp, tmp); sexp_insert_timed(ctx, tmp, tmp);
} else { } else {
sexp_delete_list(ctx, SEXP_G_THREADS_PAUSED, res); sexp_delete_list(ctx, SEXP_G_THREADS_PAUSED, res);
} }
paused = sexp_global(ctx, SEXP_G_THREADS_PAUSED);
usecs = 0; usecs = 0;
if ((sexp_context_timeval(res).tv_sec == 0) if ((sexp_context_timeval(res).tv_sec == 0)
&& (sexp_context_timeval(res).tv_usec == 0)) { && (sexp_context_timeval(res).tv_usec == 0)) {