From 34fe9232dbf6a9fe58ebc4c7680bb67d2f642c40 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Mon, 10 Jun 2019 11:08:29 +0200
Subject: 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>
---
 .../thread/qwaitcondition/tst_qwaitcondition.cpp   | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp')

diff --git a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
index 126cb6b180..5363231895 100644
--- a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
@@ -481,7 +481,7 @@ void tst_QWaitCondition::wakeOne()
         }
         mutex.unlock();
 
-        QCOMPARE(count.load(), ThreadCount);
+        QCOMPARE(count.loadRelaxed(), ThreadCount);
 
         // wake up threads one at a time
         for (x = 0; x < ThreadCount; ++x) {
@@ -502,10 +502,10 @@ void tst_QWaitCondition::wakeOne()
             }
 
             QCOMPARE(exited, 1);
-            QCOMPARE(count.load(), ThreadCount - (x + 1));
+            QCOMPARE(count.loadRelaxed(), ThreadCount - (x + 1));
         }
 
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
 
         // QReadWriteLock
         QReadWriteLock readWriteLock;
@@ -530,7 +530,7 @@ void tst_QWaitCondition::wakeOne()
         }
         readWriteLock.unlock();
 
-        QCOMPARE(count.load(), ThreadCount);
+        QCOMPARE(count.loadRelaxed(), ThreadCount);
 
         // wake up threads one at a time
         for (x = 0; x < ThreadCount; ++x) {
@@ -551,10 +551,10 @@ void tst_QWaitCondition::wakeOne()
             }
 
             QCOMPARE(exited, 1);
-            QCOMPARE(count.load(), ThreadCount - (x + 1));
+            QCOMPARE(count.loadRelaxed(), ThreadCount - (x + 1));
         }
 
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
     }
 
     // wake up threads, two at a time
@@ -585,7 +585,7 @@ void tst_QWaitCondition::wakeOne()
         }
         mutex.unlock();
 
-        QCOMPARE(count.load(), ThreadCount);
+        QCOMPARE(count.loadRelaxed(), ThreadCount);
 
         // wake up threads one at a time
         for (x = 0; x < ThreadCount; x += 2) {
@@ -608,10 +608,10 @@ void tst_QWaitCondition::wakeOne()
             }
 
             QCOMPARE(exited, 2);
-            QCOMPARE(count.load(), ThreadCount - (x + 2));
+            QCOMPARE(count.loadRelaxed(), ThreadCount - (x + 2));
         }
 
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
 
         // QReadWriteLock
         QReadWriteLock readWriteLock;
@@ -636,7 +636,7 @@ void tst_QWaitCondition::wakeOne()
         }
         readWriteLock.unlock();
 
-        QCOMPARE(count.load(), ThreadCount);
+        QCOMPARE(count.loadRelaxed(), ThreadCount);
 
         // wake up threads one at a time
         for (x = 0; x < ThreadCount; x += 2) {
@@ -659,10 +659,10 @@ void tst_QWaitCondition::wakeOne()
             }
 
             QCOMPARE(exited, 2);
-            QCOMPARE(count.load(), ThreadCount - (x + 2));
+            QCOMPARE(count.loadRelaxed(), ThreadCount - (x + 2));
         }
 
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
     }
 }
 
@@ -692,7 +692,7 @@ void tst_QWaitCondition::wakeAll()
         }
         mutex.unlock();
 
-        QCOMPARE(count.load(), ThreadCount);
+        QCOMPARE(count.loadRelaxed(), ThreadCount);
 
         // wake up all threads at once
         mutex.lock();
@@ -707,7 +707,7 @@ void tst_QWaitCondition::wakeAll()
         }
 
         QCOMPARE(exited, ThreadCount);
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
 
         // QReadWriteLock
         QReadWriteLock readWriteLock;
@@ -728,7 +728,7 @@ void tst_QWaitCondition::wakeAll()
         }
         readWriteLock.unlock();
 
-        QCOMPARE(count.load(), ThreadCount);
+        QCOMPARE(count.loadRelaxed(), ThreadCount);
 
         // wake up all threads at once
         readWriteLock.lockForWrite();
@@ -743,7 +743,7 @@ void tst_QWaitCondition::wakeAll()
         }
 
         QCOMPARE(exited, ThreadCount);
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
     }
 }
 
-- 
cgit v1.2.3