summaryrefslogtreecommitdiff
path: root/libguile/atomics-internal.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-09-06 11:04:25 +0200
committerAndy Wingo <wingo@pobox.com>2016-09-06 11:16:53 +0200
commit3425290a7b1249b8901eabf089869846d05eeb1e (patch)
treefe25ea31f8a11eb3843854b3f6cc8cdb7d04d00a /libguile/atomics-internal.h
parent7cdaf0e27b8b7c22b6ca3900eafc3ffeacb62bc9 (diff)
downloadguile-3425290a7b1249b8901eabf089869846d05eeb1e.tar.gz
Add atomic boxes
* doc/ref/api-scheduling.texi (Atomics): New manual section. * libguile.h: Include atomic.h. * libguile/Makefile.am (libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): (DOT_X_FILES, DOT_DOC_FILES, modinclude_HEADERS): Add atomic. * libguile/atomic.c: * libguile/atomic.h: New files. * libguile/atomics-internal.h (scm_atomic_set_scm, scm_atomic_ref_scm) (scm_atomic_swap_scm, scm_atomic_compare_and_swap_scm): New facilities. * libguile/goops.c (class_atomic_box, scm_sys_goops_early_init): Add support for <atomic-box>. Remove duplicate <keyword> fetch. * libguile/init.c (scm_i_init_guile): Call scm_register_atomic_box. * libguile/print.c (iprin1): Add atomic box case. * libguile/tags.h (scm_tc7_atomic_box): New tag. * libguile/validate.h (SCM_VALIDATE_ATOMIC_BOX): New macro. * module/Makefile.am (SOURCES): Add ice-9/atomic.scm. * module/ice-9/atomic.scm: New file. * module/oop/goops.scm (<atomic-box>): New var.
Diffstat (limited to 'libguile/atomics-internal.h')
-rw-r--r--libguile/atomics-internal.h88
1 files changed, 76 insertions, 12 deletions
diff --git a/libguile/atomics-internal.h b/libguile/atomics-internal.h
index 1859daa92..9d18cbc1a 100644
--- a/libguile/atomics-internal.h
+++ b/libguile/atomics-internal.h
@@ -34,46 +34,110 @@
#include <stdatomic.h>
static inline uint32_t
-scm_atomic_subtract_uint32 (uint32_t *obj, uint32_t arg)
+scm_atomic_subtract_uint32 (uint32_t *loc, uint32_t arg)
{
- return atomic_fetch_sub (obj, arg);
+ return atomic_fetch_sub (loc, arg);
}
static inline _Bool
-scm_atomic_compare_and_swap_uint32 (uint32_t *obj, uint32_t *expected,
+scm_atomic_compare_and_swap_uint32 (uint32_t *loc, uint32_t *expected,
uint32_t desired)
{
- return atomic_compare_exchange_weak (obj, expected, desired);
+ return atomic_compare_exchange_weak (loc, expected, desired);
+}
+static inline void
+scm_atomic_set_scm (SCM *loc, SCM val)
+{
+ atomic_store (loc, val);
+}
+static inline SCM
+scm_atomic_ref_scm (SCM *loc)
+{
+ return atomic_load (loc);
+}
+static inline SCM
+scm_atomic_swap_scm (SCM *loc, SCM val)
+{
+ return atomic_exchange (loc, val);
+}
+static inline _Bool
+scm_atomic_compare_and_swap_scm (SCM *loc, SCM *expected, SCM desired)
+{
+ return atomic_compare_exchange_weak (loc, expected, desired);
}
-
#else /* HAVE_C11_ATOMICS */
/* Fallback implementation using locks. */
#include "libguile/threads.h"
static scm_i_pthread_mutex_t atomics_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER;
static inline uint32_t
-scm_atomic_subtract_uint32 (uint32_t *obj, uint32_t arg)
+scm_atomic_subtract_uint32 (uint32_t *loc, uint32_t arg)
{
uint32_t ret;
scm_i_pthread_mutex_lock (&atomics_lock);
- ret = *obj;
- *obj -= arg;
+ ret = *loc;
+ *loc -= arg;
scm_i_pthread_mutex_unlock (&atomics_lock);
return ret;
}
static inline int
-scm_atomic_compare_and_swap_uint32 (uint32_t *obj, uint32_t *expected,
+scm_atomic_compare_and_swap_uint32 (uint32_t *loc, uint32_t *expected,
uint32_t desired)
{
int ret;
scm_i_pthread_mutex_lock (&atomics_lock);
- if (*obj == *expected)
+ if (*loc == *expected)
+ {
+ *loc = desired;
+ ret = 1;
+ }
+ else
+ {
+ *expected = *loc;
+ ret = 0;
+ }
+ scm_i_pthread_mutex_unlock (&atomics_lock);
+ return ret;
+}
+
+static inline void
+scm_atomic_set_scm (SCM *loc, SCM val)
+{
+ scm_i_pthread_mutex_lock (&atomics_lock);
+ *loc = val;
+ scm_i_pthread_mutex_unlock (&atomics_lock);
+}
+static inline SCM
+scm_atomic_ref_scm (SCM *loc)
+{
+ SCM ret;
+ scm_i_pthread_mutex_lock (&atomics_lock);
+ ret = *loc;
+ scm_i_pthread_mutex_unlock (&atomics_lock);
+ return ret;
+}
+static inline SCM
+scm_atomic_swap_scm (SCM *loc, SCM val)
+{
+ SCM ret;
+ scm_i_pthread_mutex_lock (&atomics_lock);
+ ret = *loc;
+ *loc = val;
+ scm_i_pthread_mutex_unlock (&atomics_lock);
+ return ret;
+}
+static inline int
+scm_atomic_compare_and_swap_scm (SCM *loc, SCM *expected, SCM desired)
+{
+ int ret;
+ scm_i_pthread_mutex_lock (&atomics_lock);
+ if (*loc == *expected)
{
- *obj = desired;
+ *loc = desired;
ret = 1;
}
else
{
- *expected = *obj;
+ *expected = *loc;
ret = 0;
}
scm_i_pthread_mutex_unlock (&atomics_lock);