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

Another thread patch from Lorenzo. If we're reduced to scheduling

Browse source 
a single thread blocked on an fd and the poll fails, optimistically
unblock it (so it can block again naturally), instead of just running
it still in a wait status.
This commit is contained in:
Alex Shinn 2013-01-06 00:22:54 +09:00
parent 1594e2322b
commit da328bb88c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -546,7 +546,7 @@ sexp sexp_scheduler (sexp ctx, sexp self, sexp_sint_t n, sexp root_thread) {
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))) if (sexp_context_refuel(ctx) > 0 && sexp_not(sexp_memq(ctx, ctx, paused)))
sexp_insert_timed(ctx, ctx, SEXP_FALSE); sexp_insert_timed(ctx, ctx, SEXP_FALSE);
paused = sexp_global(res, SEXP_G_THREADS_PAUSED); paused = sexp_global(ctx, 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;
@ -602,12 +602,17 @@ sexp sexp_scheduler (sexp ctx, sexp self, sexp_sint_t n, sexp root_thread) {
} }
} }
/* either wait on an fd, or just sleep */ /* either wait on an fd, or just sleep */
pollfds = sexp_global(res, SEXP_G_THREADS_POLL_FDS); pollfds = sexp_global(ctx, SEXP_G_THREADS_POLL_FDS);
if ((sexp_portp(sexp_context_event(res)) || sexp_fixnump(sexp_context_event(res))) if ((sexp_portp(sexp_context_event(res)) || sexp_fixnump(sexp_context_event(res)))
&& sexp_pollfdsp(ctx, pollfds)) { && sexp_pollfdsp(ctx, pollfds)) {
if ((k = poll(sexp_pollfds_fds(pollfds), sexp_pollfds_num_fds(pollfds), usecs/1000)) > 0) { if ((k = poll(sexp_pollfds_fds(pollfds), sexp_pollfds_num_fds(pollfds), usecs/1000)) > 0) {
pfds = sexp_pollfds_fds(pollfds); pfds = sexp_pollfds_fds(pollfds);
goto unblock_io_threads; goto unblock_io_threads;
} else {
/* optimistically unblock this so we have a runnable result */
/* TODO: remove the fd from the pollfds */
sexp_context_waitp(res) = sexp_context_timeoutp(res) = 0;
sexp_context_event(res) = SEXP_FALSE;
} }
} else { } else {
usleep(usecs); usleep(usecs);