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, 4 insertions, 4 deletions

diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h
index 89fd3d2592..3095c9ff52 100644
--- a/src/concurrent/qtconcurrentiteratekernel.h
+++ b/src/concurrent/qtconcurrentiteratekernel.h
@@ -206,9 +206,9 @@ public:
     bool shouldStartThread() override
     {
         if (forIteration)
-            return (currentIndex.load() < iterationCount) && !this->shouldThrottleThread();
+            return (currentIndex.loadRelaxed() < iterationCount) && !this->shouldThrottleThread();
         else // whileIteration
-            return (iteratorThreads.load() == 0);
+            return (iteratorThreads.loadRelaxed() == 0);
     }
 
     ThreadFunctionResult threadFunction() override
@@ -230,7 +230,7 @@ public:
 
             const int currentBlockSize = blockSizeManager.blockSize();
 
-            if (currentIndex.load() >= iterationCount)
+            if (currentIndex.loadRelaxed() >= iterationCount)
                 break;
 
             // Atomically reserve a block of iterationCount for this thread.
@@ -261,7 +261,7 @@ public:
             // Report progress if progress reporting enabled.
             if (progressReportingEnabled) {
                 completed.fetchAndAddAcquire(finalBlockSize);
-                this->setProgressValue(this->completed.load());
+                this->setProgressValue(this->completed.loadRelaxed());
             }
 
             if (this->shouldThrottleThread())