mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00
Code Activity

Switch to use atomic_compare_exchange_strong

Browse source 
* libguile/atomics-internal.h (scm_atomic_compare_and_swap_scm): Change
  to use same API as atomic-box-compare-and-swap!.
* libguile/intrinsics.c (atomic_compare_and_swap_scm): Remove loop, as
  we're using the strong variant now.
* libguile/async.c (scm_i_async_pop, scm_i_async_push): Adapt to new API
  of scm_atomic_compare_and_swap_scm.
This commit is contained in:
Andy Wingo 2019-05-25 17:17:49 +02:00
parent 8b8ce79e83
commit d1c2d7de2f
4 changed files with 27 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libguile/atomics-internal.h
View file

@ -1,7 +1,7 @@
#ifndef SCM_ATOMICS_INTERNAL_H
#define SCM_ATOMICS_INTERNAL_H
/* Copyright 2016,2018
/* Copyright 2016,2018-2019
Free Software Foundation, Inc.
This file is part of Guile.
@ -75,13 +75,14 @@ scm_atomic_swap_scm (SCM *loc, SCM val)
atomic_uintptr_t *a_loc = (atomic_uintptr_t *) loc;
return SCM_PACK (atomic_exchange (a_loc, SCM_UNPACK (val)));
}
static inline _Bool
scm_atomic_compare_and_swap_scm (SCM *loc, SCM *expected, SCM desired)
static inline SCM
scm_atomic_compare_and_swap_scm (SCM *loc, SCM expected, SCM desired)
{
atomic_uintptr_t *a_loc = (atomic_uintptr_t *) loc;
return atomic_compare_exchange_weak (a_loc,
(uintptr_t *) expected,
SCM_UNPACK (desired));
SCM result = expected;
atomic_compare_exchange_strong (a_loc, (uintptr_t *) &result,
SCM_UNPACK (desired));
return result;
}
#else /* HAVE_STDATOMIC_H */
@ -161,20 +162,19 @@ scm_atomic_swap_scm (SCM *loc, SCM 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)
static inline SCM
scm_atomic_compare_and_swap_scm (SCM *loc, SCM expected, SCM desired)
{
int ret;
SCM ret;
scm_i_pthread_mutex_lock (&atomics_lock);
if (*loc == *expected)
if (*loc == expected)
{
*loc = desired;
ret = 1;
ret = expected;
}
else
{
*expected = *loc;
ret = 0;
ret = *loc;
}
scm_i_pthread_mutex_unlock (&atomics_lock);
return ret;