Add the rest of the non-volatile members of std::atomic to QBasicAtomic

[ChangeLog][QtCore][Atomic support]Added more operations to the atomic
classes, including operator T(), operator=(T), operator++,
operator--. For the QAtomicInteger, bit-manipulation operations are
also provided, both in operator and in fetchAndXxxYyyyyy modes.

Change-Id: I39c07be74e15e0a48f9e931f4342b182004dee1a
Reviewed-by: David Faure <david.faure@kdab.com>

1 files changed, 83 insertions, 1 deletions

diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index b2234bdb80..cf69d34589 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -126,6 +126,8 @@ public:
 
     T loadAcquire() const Q_DECL_NOTHROW { return Ops::loadAcquire(_q_value); }
     void storeRelease(T newValue) Q_DECL_NOTHROW { Ops::storeRelease(_q_value, newValue); }
+    operator T() const Q_DECL_NOTHROW { return loadAcquire(); }
+    T operator=(T newValue) Q_DECL_NOTHROW { storeRelease(newValue); return newValue; }
 
     static Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return Ops::isReferenceCountingNative(); }
     static Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW { return Ops::isReferenceCountingWaitFree(); }
@@ -178,6 +180,63 @@ public:
     T fetchAndAddOrdered(T valueToAdd) Q_DECL_NOTHROW
     { return Ops::fetchAndAddOrdered(_q_value, valueToAdd); }
 
+    T fetchAndSubRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubRelaxed(_q_value, valueToAdd); }
+    T fetchAndSubAcquire(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubAcquire(_q_value, valueToAdd); }
+    T fetchAndSubRelease(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubRelease(_q_value, valueToAdd); }
+    T fetchAndSubOrdered(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubOrdered(_q_value, valueToAdd); }
+
+    T fetchAndAndRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndAndRelaxed(_q_value, valueToAdd); }
+    T fetchAndAndAcquire(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndAndAcquire(_q_value, valueToAdd); }
+    T fetchAndAndRelease(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndAndRelease(_q_value, valueToAdd); }
+    T fetchAndAndOrdered(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndAndOrdered(_q_value, valueToAdd); }
+
+    T fetchAndOrRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndOrRelaxed(_q_value, valueToAdd); }
+    T fetchAndOrAcquire(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndOrAcquire(_q_value, valueToAdd); }
+    T fetchAndOrRelease(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndOrRelease(_q_value, valueToAdd); }
+    T fetchAndOrOrdered(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndOrOrdered(_q_value, valueToAdd); }
+
+    T fetchAndXorRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndXorRelaxed(_q_value, valueToAdd); }
+    T fetchAndXorAcquire(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndXorAcquire(_q_value, valueToAdd); }
+    T fetchAndXorRelease(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndXorRelease(_q_value, valueToAdd); }
+    T fetchAndXorOrdered(T valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndXorOrdered(_q_value, valueToAdd); }
+
+    T operator++() Q_DECL_NOTHROW
+    { return fetchAndAddOrdered(1) + 1; }
+    T operator++(int) Q_DECL_NOTHROW
+    { return fetchAndAddOrdered(1); }
+    T operator--() Q_DECL_NOTHROW
+    { return fetchAndSubOrdered(1) - 1; }
+    T operator--(int) Q_DECL_NOTHROW
+    { return fetchAndSubOrdered(1); }
+
+    T operator+=(T v) Q_DECL_NOTHROW
+    { return fetchAndAddOrdered(v) + v; }
+    T operator-=(T v) Q_DECL_NOTHROW
+    { return fetchAndSubOrdered(v) - v; }
+    T operator&=(T v) Q_DECL_NOTHROW
+    { return fetchAndAndOrdered(v) & v; }
+    T operator|=(T v) Q_DECL_NOTHROW
+    { return fetchAndOrOrdered(v) | v; }
+    T operator^=(T v) Q_DECL_NOTHROW
+    { return fetchAndXorOrdered(v) ^ v; }
+
+
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
     QBasicAtomicInteger() = default;
     constexpr QBasicAtomicInteger(T value) Q_DECL_NOTHROW : _q_value(value) {}
@@ -198,9 +257,10 @@ public:
 
     AtomicType _q_value;
 
-    // Non-atomic API
     Type load() const Q_DECL_NOTHROW { return _q_value; }
     void store(Type newValue) Q_DECL_NOTHROW { _q_value = newValue; }
+    operator Type() const Q_DECL_NOTHROW { return loadAcquire(); }
+    Type operator=(Type newValue) Q_DECL_NOTHROW { storeRelease(newValue); return newValue; }
 
     // Atomic API, implemented in qatomic_XXX.h
     Type loadAcquire() const Q_DECL_NOTHROW { return Ops::loadAcquire(_q_value); }
@@ -251,6 +311,28 @@ public:
     Type fetchAndAddOrdered(qptrdiff valueToAdd) Q_DECL_NOTHROW
     { return Ops::fetchAndAddOrdered(_q_value, valueToAdd); }
 
+    Type fetchAndSubRelaxed(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubRelaxed(_q_value, valueToAdd); }
+    Type fetchAndSubAcquire(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubAcquire(_q_value, valueToAdd); }
+    Type fetchAndSubRelease(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubRelease(_q_value, valueToAdd); }
+    Type fetchAndSubOrdered(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    { return Ops::fetchAndSubOrdered(_q_value, valueToAdd); }
+
+    Type operator++() Q_DECL_NOTHROW
+    { return fetchAndAddOrdered(1) + 1; }
+    Type operator++(int) Q_DECL_NOTHROW
+    { return fetchAndAddOrdered(1); }
+    Type operator--() Q_DECL_NOTHROW
+    { return fetchAndSubOrdered(1) - 1; }
+    Type operator--(int) Q_DECL_NOTHROW
+    { return fetchAndSubOrdered(1); }
+    Type operator+=(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    { return fetchAndAddOrdered(valueToAdd) + valueToAdd; }
+    Type operator-=(qptrdiff valueToSub) Q_DECL_NOTHROW
+    { return fetchAndSubOrdered(valueToSub) - valueToSub; }
+
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
     QBasicAtomicPointer() = default;
     constexpr QBasicAtomicPointer(Type value) Q_DECL_NOTHROW : _q_value(value) {}