Port from QAtomic::load() to loadRelaxed()

Semi-automated, just needed ~20 manual fixes:

$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)load\(\)/$1loadRelaxed\(\)/g' -i \{\} +
$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)store\(/$1storeRelaxed\(/g' -i \{\} +

It can be easily improved (e.g. for store check that there are no commas
after the opening parens). The most common offender is QLibrary::load,
and some code using std::atomic directly.

Change-Id: I07c38a3c8ed32c924ef4999e85c7e45cf48f0f6c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
 
 

1 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index 2e0b6f2bc0..d4fb756b94 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -264,7 +264,7 @@ template <bool IsTimed> bool futexSemaphoreTryAcquire(QBasicAtomicInteger<quintp
 
     if (futexHasWaiterCount) {
         // decrement the number of threads waiting
-        Q_ASSERT(futexHigh32(&u)->load() & 0x7fffffffU);
+        Q_ASSERT(futexHigh32(&u)->loadRelaxed() & 0x7fffffffU);
         u.fetchAndSubRelaxed(oneWaiter);
     }
     return false;
@@ -293,7 +293,7 @@ QSemaphore::QSemaphore(int n)
         quintptr nn = unsigned(n);
         if (futexHasWaiterCount)
             nn |= quint64(nn) << 32;    // token count replicated in high word
-        u.store(nn);
+        u.storeRelaxed(nn);
     } else {
         d = new QSemaphorePrivate(n);
     }
@@ -425,7 +425,7 @@ void QSemaphore::release(int n)
 int QSemaphore::available() const
 {
     if (futexAvailable())
-        return futexAvailCounter(u.load());
+        return futexAvailCounter(u.loadRelaxed());
 
     QMutexLocker locker(&d->mutex);
     return d->avail;