Remove QGenericAtomicOps
Commit c5b816393d ("Get rid of
bootstrapped atomics", 6.5) removed the last use of them.
Pick-to: 6.6
Change-Id: I53335f845a1345299031fffd176f52293e4b9752
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira
parent
25b4bd5841
commit
7c25358144
@ -34,335 +34,5 @@ template <typename T> struct QAtomicAdditiveType<T *>
|
||||
static const int AddScale = sizeof(T);
|
||||
};
|
||||
|
||||
// not really atomic...
|
||||
template <typename BaseClass> struct QGenericAtomicOps
|
||||
{
|
||||
template <typename T> struct AtomicType { typedef T Type; typedef T *PointerType; };
|
||||
|
||||
template <typename T> static void acquireMemoryFence(const T &_q_value) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
}
|
||||
template <typename T> static void releaseMemoryFence(const T &_q_value) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
}
|
||||
template <typename T> static void orderedMemoryFence(const T &) noexcept
|
||||
{
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T load(const T &_q_value) noexcept
|
||||
{
|
||||
return _q_value;
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
void store(T &_q_value, X newValue) noexcept
|
||||
{
|
||||
_q_value = newValue;
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T loadRelaxed(const T &_q_value) noexcept
|
||||
{
|
||||
return _q_value;
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
void storeRelaxed(T &_q_value, X newValue) noexcept
|
||||
{
|
||||
_q_value = newValue;
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T loadAcquire(const T &_q_value) noexcept
|
||||
{
|
||||
T tmp = *static_cast<const volatile T *>(&_q_value);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
void storeRelease(T &_q_value, X newValue) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
*static_cast<volatile T *>(&_q_value) = newValue;
|
||||
}
|
||||
|
||||
static inline constexpr bool isReferenceCountingNative() noexcept
|
||||
{ return BaseClass::isFetchAndAddNative(); }
|
||||
static inline constexpr bool isReferenceCountingWaitFree() noexcept
|
||||
{ return BaseClass::isFetchAndAddWaitFree(); }
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
bool ref(T &_q_value) noexcept
|
||||
{
|
||||
return BaseClass::fetchAndAddRelaxed(_q_value, 1) != T(-1);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
bool deref(T &_q_value) noexcept
|
||||
{
|
||||
return BaseClass::fetchAndAddRelaxed(_q_value, -1) != 1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
// These functions have no default implementation
|
||||
// Architectures must implement them
|
||||
static inline constexpr bool isTestAndSetNative() noexcept;
|
||||
static inline constexpr bool isTestAndSetWaitFree() noexcept;
|
||||
template <typename T, typename X> static inline
|
||||
bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue) noexcept;
|
||||
template <typename T, typename X> static inline
|
||||
bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept;
|
||||
#endif
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue) noexcept
|
||||
{
|
||||
bool tmp = BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
bool testAndSetRelease(T &_q_value, X expectedValue, X newValue) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue);
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue);
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept
|
||||
{
|
||||
bool tmp = BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
bool testAndSetRelease(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue);
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue);
|
||||
}
|
||||
|
||||
static inline constexpr bool isFetchAndStoreNative() noexcept { return false; }
|
||||
static inline constexpr bool isFetchAndStoreWaitFree() noexcept { return false; }
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
T fetchAndStoreRelaxed(T &_q_value, X newValue) noexcept
|
||||
{
|
||||
// implement fetchAndStore on top of testAndSet
|
||||
for (;;) {
|
||||
T tmp = loadRelaxed(_q_value);
|
||||
if (BaseClass::testAndSetRelaxed(_q_value, tmp, newValue))
|
||||
return tmp;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
T fetchAndStoreAcquire(T &_q_value, X newValue) noexcept
|
||||
{
|
||||
T tmp = BaseClass::fetchAndStoreRelaxed(_q_value, newValue);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
T fetchAndStoreRelease(T &_q_value, X newValue) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndStoreRelaxed(_q_value, newValue);
|
||||
}
|
||||
|
||||
template <typename T, typename X> static Q_ALWAYS_INLINE
|
||||
T fetchAndStoreOrdered(T &_q_value, X newValue) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndStoreRelaxed(_q_value, newValue);
|
||||
}
|
||||
|
||||
static inline constexpr bool isFetchAndAddNative() noexcept { return false; }
|
||||
static inline constexpr bool isFetchAndAddWaitFree() noexcept { return false; }
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
|
||||
{
|
||||
// implement fetchAndAdd on top of testAndSet
|
||||
for (;;) {
|
||||
T tmp = BaseClass::loadRelaxed(_q_value);
|
||||
if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp + valueToAdd)))
|
||||
return tmp;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAddAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
|
||||
{
|
||||
T tmp = BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAddRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAddOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd);
|
||||
}
|
||||
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_MSVC(4146) // unary minus operator applied to unsigned type, result still unsigned
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndSubRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
|
||||
{
|
||||
// implement fetchAndSub on top of fetchAndAdd
|
||||
return fetchAndAddRelaxed(_q_value, -operand);
|
||||
}
|
||||
QT_WARNING_POP
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndSubAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
|
||||
{
|
||||
T tmp = BaseClass::fetchAndSubRelaxed(_q_value, operand);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndSubRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndSubRelaxed(_q_value, operand);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndSubOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndSubRelaxed(_q_value, operand);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAndRelaxed(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
// implement fetchAndAnd on top of testAndSet
|
||||
T tmp = BaseClass::loadRelaxed(_q_value);
|
||||
for (;;) {
|
||||
if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp & operand), &tmp))
|
||||
return tmp;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAndAcquire(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
T tmp = BaseClass::fetchAndAndRelaxed(_q_value, operand);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAndRelease(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndAndRelaxed(_q_value, operand);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndAndOrdered(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndAndRelaxed(_q_value, operand);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndOrRelaxed(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
// implement fetchAndOr on top of testAndSet
|
||||
T tmp = BaseClass::loadRelaxed(_q_value);
|
||||
for (;;) {
|
||||
if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp | operand), &tmp))
|
||||
return tmp;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndOrAcquire(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
T tmp = BaseClass::fetchAndOrRelaxed(_q_value, operand);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndOrRelease(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndOrRelaxed(_q_value, operand);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndOrOrdered(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndOrRelaxed(_q_value, operand);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndXorRelaxed(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
// implement fetchAndXor on top of testAndSet
|
||||
T tmp = BaseClass::loadRelaxed(_q_value);
|
||||
for (;;) {
|
||||
if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp ^ operand), &tmp))
|
||||
return tmp;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndXorAcquire(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
T tmp = BaseClass::fetchAndXorRelaxed(_q_value, operand);
|
||||
BaseClass::acquireMemoryFence(_q_value);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndXorRelease(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
BaseClass::releaseMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndXorRelaxed(_q_value, operand);
|
||||
}
|
||||
|
||||
template <typename T> static Q_ALWAYS_INLINE
|
||||
T fetchAndXorOrdered(T &_q_value, typename std::enable_if<std::is_integral_v<T>, T>::type operand) noexcept
|
||||
{
|
||||
BaseClass::orderedMemoryFence(_q_value);
|
||||
return BaseClass::fetchAndXorRelaxed(_q_value, operand);
|
||||
}
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#endif // QGENERICATOMIC_H
|
||||
|
||||
Loading…
Reference in New Issue
Block a user