diff options
| author | Andy Wingo <wingo@pobox.com> | 2016-10-26 22:32:51 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2016-10-26 22:50:26 +0200 |
| commit | c957ec7ab0f0a028910dc737e12191f7bdc1ca93 (patch) | |
| tree | 5949cfd1de4a7eecfacb35611430498a53b4c2fe /libguile/fports.c | |
| parent | f3bfe29235199e12b961c3fd1fa92666ad031d0d (diff) | |
| download | guile-c957ec7ab0f0a028910dc737e12191f7bdc1ca93.tar.gz | |
Use atomics for async interrupts
* libguile/__scm.h (SCM_TICK): Always define as scm_async_tick().
* libguile/error.c (scm_syserror, scm_syserror_msg):
* libguile/fports.c (fport_read, fport_write):
* libguile/_scm.h (SCM_SYSCALL): Replace SCM_ASYNC_TICK with
scm_async_tick ().
(SCM_ASYNC_TICK, SCM_ASYNC_TICK_WITH_CODE)
(SCM_ASYNC_TICK_WITH_GUARD_CODE): Remove internal definitions. We
inline into vm-engine.c, the only place where it matters.
* libguile/async.h:
* libguile/async.c (scm_async_tick, scm_i_setup_sleep):
(scm_i_reset_sleep, scm_system_async_mark_for_thread):
* libguile/threads.h (struct scm_thread_wake_data):
* libguile/threads.h (scm_i_thread):
* libguile/threads.c (block_self, guilify_self_1, scm_std_select):
Rewrite to use sequentially-consistent atomic references.
* libguile/atomics-internal.h (scm_atomic_set_pointer):
(scm_atomic_ref_pointer): New definitions.
* libguile/finalizers.c (queue_finalizer_async): We can allocate, so
just use scm_system_async_mark_for_thread instead of the set-cdr!
shenanigans.
* libguile/scmsigs.c (take_signal):
* libguile/gc.c (queue_after_gc_hook): Adapt to new asyncs mechanism.
Can't allocate but we're just manipulating the current thread when no
other threads are running so we should be good.
* libguile/vm-engine.c (VM_HANDLE_INTERRUPTS): Inline the async_tick
business.
Diffstat (limited to 'libguile/fports.c')
| -rw-r--r-- | libguile/fports.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/fports.c b/libguile/fports.c index 5886f628d..8fa69933d 100644 --- a/libguile/fports.c +++ b/libguile/fports.c @@ -595,7 +595,7 @@ fport_read (SCM port, SCM dst, size_t start, size_t count) { if (errno == EINTR) { - SCM_ASYNC_TICK; + scm_async_tick (); goto retry; } if (errno == EWOULDBLOCK || errno == EAGAIN) @@ -618,7 +618,7 @@ fport_write (SCM port, SCM src, size_t start, size_t count) { if (errno == EINTR) { - SCM_ASYNC_TICK; + scm_async_tick (); goto retry; } if (errno == EWOULDBLOCK || errno == EAGAIN) |