1*4882a593SmuzhiyunFrom 114c42fba3fc86119710e8dd1bb2b7a9e39e3064 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 17 Jun 2021 19:35:01 -0700 4*4882a593SmuzhiyunSubject: [PATCH] replace old sync with new atomic builtin equivalents 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunHelps compiling with gcc on newer arches e.g. riscv32 where these 7*4882a593Smuzhiyun__sync* builtins are not implemented atleast for 64bit values 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun .../range/range_tree/lib/portability/toku_atomic.h | 12 ++++++------ 12*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 6 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_atomic.h 15*4882a593Smuzhiyun+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_atomic.h 16*4882a593Smuzhiyun@@ -77,37 +77,37 @@ template <typename T, typename U> 17*4882a593Smuzhiyun __attribute__((always_inline)) static inline T toku_sync_fetch_and_add(T *addr, 18*4882a593Smuzhiyun U diff) { 19*4882a593Smuzhiyun paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); 20*4882a593Smuzhiyun- return __sync_fetch_and_add(addr, diff); 21*4882a593Smuzhiyun+ return __atomic_fetch_add(addr, diff, 5); 22*4882a593Smuzhiyun } 23*4882a593Smuzhiyun template <typename T, typename U> 24*4882a593Smuzhiyun __attribute__((always_inline)) static inline T toku_sync_add_and_fetch(T *addr, 25*4882a593Smuzhiyun U diff) { 26*4882a593Smuzhiyun paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); 27*4882a593Smuzhiyun- return __sync_add_and_fetch(addr, diff); 28*4882a593Smuzhiyun+ return __atomic_add_fetch(addr, diff, 5); 29*4882a593Smuzhiyun } 30*4882a593Smuzhiyun template <typename T, typename U> 31*4882a593Smuzhiyun __attribute__((always_inline)) static inline T toku_sync_fetch_and_sub(T *addr, 32*4882a593Smuzhiyun U diff) { 33*4882a593Smuzhiyun paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); 34*4882a593Smuzhiyun- return __sync_fetch_and_sub(addr, diff); 35*4882a593Smuzhiyun+ return __atomic_fetch_sub(addr, diff, 5); 36*4882a593Smuzhiyun } 37*4882a593Smuzhiyun template <typename T, typename U> 38*4882a593Smuzhiyun __attribute__((always_inline)) static inline T toku_sync_sub_and_fetch(T *addr, 39*4882a593Smuzhiyun U diff) { 40*4882a593Smuzhiyun paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); 41*4882a593Smuzhiyun- return __sync_sub_and_fetch(addr, diff); 42*4882a593Smuzhiyun+ return __atomic_sub_fetch(addr, diff, 5); 43*4882a593Smuzhiyun } 44*4882a593Smuzhiyun template <typename T, typename U, typename V> 45*4882a593Smuzhiyun __attribute__((always_inline)) static inline T toku_sync_val_compare_and_swap( 46*4882a593Smuzhiyun T *addr, U oldval, V newval) { 47*4882a593Smuzhiyun paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); 48*4882a593Smuzhiyun- return __sync_val_compare_and_swap(addr, oldval, newval); 49*4882a593Smuzhiyun+ return __atomic_compare_exchange(addr, oldval, newval); 50*4882a593Smuzhiyun } 51*4882a593Smuzhiyun template <typename T, typename U, typename V> 52*4882a593Smuzhiyun __attribute__((always_inline)) static inline bool 53*4882a593Smuzhiyun toku_sync_bool_compare_and_swap(T *addr, U oldval, V newval) { 54*4882a593Smuzhiyun paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); 55*4882a593Smuzhiyun- return __sync_bool_compare_and_swap(addr, oldval, newval); 56*4882a593Smuzhiyun+ return static_cast<bool>(__atomic_compare_exchange(addr, oldval, newval)); 57*4882a593Smuzhiyun } 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun // in case you include this but not toku_portability.h 60