From 342b37f3884e62f2097addda1aacb1d15be38bf7 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 25 Oct 2023 07:53:45 +0000 Subject: Revert "QAtomic: remove the copy ctor and assignment operator" This reverts commit 6a93ec2435b8a453d43956fef6afa5f091d70ffc. Reason for revert: Breaks qtdeclarative build, submodules need to be clean before we deprecate or remove APIs. Change-Id: Id0726b9bfad6072065b380b44b6ff6dffda79e45 Reviewed-by: Fabian Kosmale Reviewed-by: Friedemann Kleint --- src/corelib/thread/qatomic.cpp | 27 +++++++++++ src/corelib/thread/qatomic.h | 34 +++++++++++--- src/corelib/thread/qbasicatomic.h | 4 +- .../corelib/thread/qatomicint/tst_qatomicint.cpp | 25 +++++++++++ .../thread/qatomicinteger/tst_qatomicinteger.cpp | 52 ++++++++++++++++++++++ .../thread/qatomicpointer/tst_qatomicpointer.cpp | 22 +++++++++ 6 files changed, 157 insertions(+), 7 deletions(-) diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index 948f30bb98..4843556eb5 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -210,6 +210,20 @@ Constructs a QAtomicInteger with the given \a value. */ +/*! + \fn template QAtomicInteger::QAtomicInteger(const QAtomicInteger &other) + + Constructs a copy of \a other. +*/ + +/*! + \fn template QAtomicInteger &QAtomicInteger::operator=(const QAtomicInteger &other) + + Assigns \a other to this QAtomicInteger and returns a reference to + this QAtomicInteger. +*/ + + /*! \fn template T QAtomicInteger::loadRelaxed() const \since 5.14 @@ -1354,6 +1368,19 @@ Constructs a QAtomicPointer with the given \a value. */ +/*! + \fn template QAtomicPointer::QAtomicPointer(const QAtomicPointer &other) + + Constructs a copy of \a other. +*/ + +/*! + \fn template QAtomicPointer &QAtomicPointer::operator=(const QAtomicPointer &other) + + Assigns \a other to this QAtomicPointer and returns a reference to + this QAtomicPointer. +*/ + /*! \fn template T *QAtomicPointer::loadRelaxed() const \since 5.14 diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index 26369d28f8..7fe5ac69b9 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -17,8 +17,20 @@ template class QAtomicInteger : public QBasicAtomicInteger { public: + // Non-atomic API constexpr QAtomicInteger(T value = 0) noexcept : QBasicAtomicInteger(value) {} - using QBasicAtomicInteger::operator=; + + inline QAtomicInteger(const QAtomicInteger &other) noexcept + : QBasicAtomicInteger() + { + this->storeRelease(other.loadAcquire()); + } + + inline QAtomicInteger &operator=(const QAtomicInteger &other) noexcept + { + this->storeRelease(other.loadAcquire()); + return *this; + } #ifdef Q_QDOC T loadRelaxed() const; @@ -96,12 +108,13 @@ public: #endif }; -// ### Qt 7: make QAtomicInt a typedef class QAtomicInt : public QAtomicInteger { public: - using QAtomicInteger::QAtomicInteger; - using QAtomicInteger::operator=; + // Non-atomic API + // We could use QT_COMPILER_INHERITING_CONSTRUCTORS, but we need only one; + // the implicit definition for all the others is fine. + constexpr QAtomicInt(int value = 0) noexcept : QAtomicInteger(value) {} }; // High-level atomic pointer operations @@ -110,7 +123,18 @@ class QAtomicPointer : public QBasicAtomicPointer { public: constexpr QAtomicPointer(T *value = nullptr) noexcept : QBasicAtomicPointer(value) {} - using QBasicAtomicPointer::operator=; + + inline QAtomicPointer(const QAtomicPointer &other) noexcept + : QBasicAtomicPointer() + { + this->storeRelease(other.loadAcquire()); + } + + inline QAtomicPointer &operator=(const QAtomicPointer &other) noexcept + { + this->storeRelease(other.loadAcquire()); + return *this; + } #ifdef Q_QDOC T *loadAcquire() const; diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 4dd67f57c3..6d061ea49a 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -39,7 +39,7 @@ public: T loadAcquire() const noexcept { return Ops::loadAcquire(_q_value); } void storeRelease(T newValue) noexcept { Ops::storeRelease(_q_value, newValue); } operator T() const noexcept { return loadAcquire(); } - QBasicAtomicInteger &operator=(T newValue) noexcept { storeRelease(newValue); return *this; } + T operator=(T newValue) noexcept { storeRelease(newValue); return newValue; } static constexpr bool isReferenceCountingNative() noexcept { return Ops::isReferenceCountingNative(); } static constexpr bool isReferenceCountingWaitFree() noexcept { return Ops::isReferenceCountingWaitFree(); } @@ -171,7 +171,7 @@ public: void storeRelaxed(Type newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); } operator Type() const noexcept { return loadAcquire(); } - QBasicAtomicPointer &operator=(Type newValue) noexcept { storeRelease(newValue); return *this; } + Type operator=(Type newValue) noexcept { storeRelease(newValue); return newValue; } // Atomic API, implemented in qatomic_XXX.h Type loadAcquire() const noexcept { return Ops::loadAcquire(_q_value); } diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp index 315256e471..e8606b2568 100644 --- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp @@ -21,6 +21,8 @@ private slots: // QAtomicInt members void constructor_data(); void constructor(); + void copy_constructor_data(); + void copy_constructor(); void assignment_operator_data(); void assignment_operator(); @@ -234,6 +236,25 @@ void tst_QAtomicInt::constructor() QCOMPARE(atomic2.loadRelaxed(), value); } +void tst_QAtomicInt::copy_constructor_data() +{ constructor_data(); } + +void tst_QAtomicInt::copy_constructor() +{ + QFETCH(int, value); + QAtomicInt atomic1(value); + QCOMPARE(atomic1.loadRelaxed(), value); + + QAtomicInt atomic2(atomic1); + QCOMPARE(atomic2.loadRelaxed(), value); + QAtomicInt atomic3 = atomic1; + QCOMPARE(atomic3.loadRelaxed(), value); + QAtomicInt atomic4(atomic2); + QCOMPARE(atomic4.loadRelaxed(), value); + QAtomicInt atomic5 = atomic2; + QCOMPARE(atomic5.loadRelaxed(), value); +} + void tst_QAtomicInt::assignment_operator_data() { QTest::addColumn("value"); @@ -258,6 +279,10 @@ void tst_QAtomicInt::assignment_operator() QCOMPARE(atomic1.loadRelaxed(), newval); atomic1 = value; QCOMPARE(atomic1.loadRelaxed(), value); + + QAtomicInt atomic2 = newval; + atomic1 = atomic2; + QCOMPARE(atomic1.loadRelaxed(), atomic2.loadRelaxed()); } } diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp index 1ac07de80f..4e3c93c4e9 100644 --- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp +++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp @@ -90,6 +90,12 @@ private Q_SLOTS: void constructor_data() { addData(); } void constructor(); + void copy_data() { addData(); } + void copy(); + + void assign_data() { addData(); } + void assign(); + void operatorInteger_data() { addData(); } void operatorInteger(); @@ -213,6 +219,52 @@ void tst_QAtomicIntegerXX::constructor() QVERIFY(atomic.loadRelaxed() <= std::numeric_limits::max()); } +void tst_QAtomicIntegerXX::copy() +{ + QFETCH(LargeInt, value); + + QAtomicInteger atomic(value); + QAtomicInteger copy(atomic); + QCOMPARE(copy.loadRelaxed(), atomic.loadRelaxed()); + + QAtomicInteger copy2 = atomic; + QCOMPARE(copy2.loadRelaxed(), atomic.loadRelaxed()); + + // move + QAtomicInteger copy3(std::move(copy)); + QCOMPARE(copy3.loadRelaxed(), atomic.loadRelaxed()); + + QAtomicInteger copy4 = std::move(copy2); + QCOMPARE(copy4.loadRelaxed(), atomic.loadRelaxed()); +} + +void tst_QAtomicIntegerXX::assign() +{ + QFETCH(LargeInt, value); + + QAtomicInteger atomic(value); + QAtomicInteger copy; + copy = atomic; + QCOMPARE(copy.loadRelaxed(), atomic.loadRelaxed()); + + QAtomicInteger copy2; + copy2 = atomic; // operator=(const QAtomicInteger &) + QCOMPARE(copy2.loadRelaxed(), atomic.loadRelaxed()); + + QAtomicInteger copy2bis; + copy2bis = atomic.loadRelaxed(); // operator=(T) + QCOMPARE(copy2bis.loadRelaxed(), atomic.loadRelaxed()); + + // move + QAtomicInteger copy3; + copy3 = std::move(copy); + QCOMPARE(copy3.loadRelaxed(), atomic.loadRelaxed()); + + QAtomicInteger copy4; + copy4 = std::move(copy2); + QCOMPARE(copy4.loadRelaxed(), atomic.loadRelaxed()); +} + void tst_QAtomicIntegerXX::operatorInteger() { QFETCH(LargeInt, value); diff --git a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp index 1113e73b1b..c6bd784270 100644 --- a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp @@ -15,6 +15,7 @@ private slots: void alignment(); void constructor(); + void copy_constructor(); void assignment_operator(); void isTestAndSetNative(); @@ -100,6 +101,27 @@ void tst_QAtomicPointer::constructor() QCOMPARE(atomic3.loadRelaxed(), three); } +void tst_QAtomicPointer::copy_constructor() +{ + void *one = this; + QAtomicPointer atomic1 = one; + QAtomicPointer atomic1_copy = atomic1; + QCOMPARE(atomic1_copy.loadRelaxed(), one); + QCOMPARE(atomic1_copy.loadRelaxed(), atomic1.loadRelaxed()); + + void *two = &one; + QAtomicPointer atomic2 = two; + QAtomicPointer atomic2_copy = atomic2; + QCOMPARE(atomic2_copy.loadRelaxed(), two); + QCOMPARE(atomic2_copy.loadRelaxed(), atomic2.loadRelaxed()); + + void *three = &two; + QAtomicPointer atomic3 = three; + QAtomicPointer atomic3_copy = atomic3; + QCOMPARE(atomic3_copy.loadRelaxed(), three); + QCOMPARE(atomic3_copy.loadRelaxed(), atomic3.loadRelaxed()); +} + void tst_QAtomicPointer::assignment_operator() { void *one = this; -- cgit v1.2.3