diff options
Diffstat (limited to 'storage/perfschema/pfs_atomic.h')
| -rw-r--r-- | storage/perfschema/pfs_atomic.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/storage/perfschema/pfs_atomic.h b/storage/perfschema/pfs_atomic.h index 00d1197970b..959b66dccb2 100644 --- a/storage/perfschema/pfs_atomic.h +++ b/storage/perfschema/pfs_atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, @@ -35,101 +35,101 @@ class PFS_atomic { public: /** Atomic load. */ - static inline int32 load_32(volatile int32 *ptr) + static inline int32 load_32(int32 *ptr) { return my_atomic_load32(ptr); } /** Atomic load. */ - static inline int64 load_64(volatile int64 *ptr) + static inline int64 load_64(int64 *ptr) { return my_atomic_load64(ptr); } /** Atomic load. */ - static inline uint32 load_u32(volatile uint32 *ptr) + static inline uint32 load_u32(uint32 *ptr) { return (uint32) my_atomic_load32((int32*) ptr); } /** Atomic load. */ - static inline uint64 load_u64(volatile uint64 *ptr) + static inline uint64 load_u64(uint64 *ptr) { return (uint64) my_atomic_load64((int64*) ptr); } /** Atomic store. */ - static inline void store_32(volatile int32 *ptr, int32 value) + static inline void store_32(int32 *ptr, int32 value) { my_atomic_store32(ptr, value); } /** Atomic store. */ - static inline void store_64(volatile int64 *ptr, int64 value) + static inline void store_64(int64 *ptr, int64 value) { my_atomic_store64(ptr, value); } /** Atomic store. */ - static inline void store_u32(volatile uint32 *ptr, uint32 value) + static inline void store_u32(uint32 *ptr, uint32 value) { my_atomic_store32((int32*) ptr, (int32) value); } /** Atomic store. */ - static inline void store_u64(volatile uint64 *ptr, uint64 value) + static inline void store_u64(uint64 *ptr, uint64 value) { my_atomic_store64((int64*) ptr, (int64) value); } /** Atomic add. */ - static inline int32 add_32(volatile int32 *ptr, int32 value) + static inline int32 add_32(int32 *ptr, int32 value) { return my_atomic_add32(ptr, value); } /** Atomic add. */ - static inline int64 add_64(volatile int64 *ptr, int64 value) + static inline int64 add_64(int64 *ptr, int64 value) { return my_atomic_add64(ptr, value); } /** Atomic add. */ - static inline uint32 add_u32(volatile uint32 *ptr, uint32 value) + static inline uint32 add_u32(uint32 *ptr, uint32 value) { return (uint32) my_atomic_add32((int32*) ptr, (int32) value); } /** Atomic add. */ - static inline uint64 add_u64(volatile uint64 *ptr, uint64 value) + static inline uint64 add_u64(uint64 *ptr, uint64 value) { return (uint64) my_atomic_add64((int64*) ptr, (int64) value); } /** Atomic compare and swap. */ - static inline bool cas_32(volatile int32 *ptr, int32 *old_value, + static inline bool cas_32(int32 *ptr, int32 *old_value, int32 new_value) { return my_atomic_cas32(ptr, old_value, new_value); } /** Atomic compare and swap. */ - static inline bool cas_64(volatile int64 *ptr, int64 *old_value, + static inline bool cas_64(int64 *ptr, int64 *old_value, int64 new_value) { return my_atomic_cas64(ptr, old_value, new_value); } /** Atomic compare and swap. */ - static inline bool cas_u32(volatile uint32 *ptr, uint32 *old_value, + static inline bool cas_u32(uint32 *ptr, uint32 *old_value, uint32 new_value) { return my_atomic_cas32((int32*) ptr, (int32*) old_value, - (uint32) new_value); + (uint32) new_value); } /** Atomic compare and swap. */ - static inline bool cas_u64(volatile uint64 *ptr, uint64 *old_value, + static inline bool cas_u64(uint64 *ptr, uint64 *old_value, uint64 new_value) { return my_atomic_cas64((int64*) ptr, (int64*) old_value, |