From 813b307549daffa9a654d62e98a71ea8a11f932d Mon Sep 17 00:00:00 2001 From: torvald Date: Sat, 24 Dec 2011 01:42:20 +0000 Subject: libitm: Fixed conversion to C++11 atomics. libitm/ * beginend.cc (GTM::gtm_thread::begin_transaction): Add comment. (GTM::gtm_thread::try_commit): Changed memory order. * config/linux/alpha/futex_bits.h (sys_futex0): Take atomic int as parameter. * config/linux/x86/futex_bits.h (sys_futex0): Same. * config/linux/sh/futex_bits.h (sys_futex0): Same. * config/linux/futex_bits.h (sys_futex0): Same. * config/linux/futex.cc (futex_wait, futex_wake): Same. * config/linux/futex.h (futex_wait, futex_wake): Same. * config/linux/rwlock.h (gtm_rwlock::writers, gtm_rwlock::writer_readers, gtm_rwlock::readers): Change to atomic ints. * config/linux/rwlock.cc (gtm_rwlock::read_lock, gtm_rwlock::write_lock_generic, gtm_rwlock::read_unlock, gtm_rwlock::write_unlock): Fix memory orders and fences. * config/posix/rwlock.cc (gtm_rwlock::read_lock, gtm_rwlock::write_lock_generic, gtm_rwlock::read_unlock, gtm_rwlock::write_unlock): Same. * config/linux/rwlock.h (gtm_rwlock::summary): Change to atomic int. * method-gl.cc (gl_mg::init, gl_wt_dispatch::memtransfer_static, gl_wt_dispatch::memset_static, gl_wt_dispatch::begin_or_restart): Add comments. (gl_wt_dispatch::pre_write, gl_wt_dispatch::validate, gl_wt_dispatch::load, gl_wt_dispatch::store, gl_wt_dispatch::try_commit, gl_wt_dispatch::rollback): Fix memory orders and fences. Add comments. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182674 138bc75d-0d04-0410-961f-82ee72b054a4 --- libitm/config/linux/futex.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libitm/config/linux/futex.h') diff --git a/libitm/config/linux/futex.h b/libitm/config/linux/futex.h index 00161b47431..02bf5d0e323 100644 --- a/libitm/config/linux/futex.h +++ b/libitm/config/linux/futex.h @@ -27,10 +27,12 @@ #ifndef GTM_FUTEX_H #define GTM_FUTEX_H 1 +#include "local_atomic" + namespace GTM HIDDEN { -extern void futex_wait (int *addr, int val); -extern long futex_wake (int *addr, int count); +extern void futex_wait (std::atomic *addr, int val); +extern long futex_wake (std::atomic *addr, int count); } -- cgit v1.2.1