test, bench: make prevector and checkqueue swap member functions noexcept

jonatack · jonatack · commit e5485e8e4be7 · 2022-04-28T20:34:43.000+02:00
Reason: A swap must not fail; when a class has a swap member function, it should be declared noexcept. https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#c84-a-swap-function-must-not-fail
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
@@ -39,7 +39,10 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
         {
             return true;
         }
-        void swap(PrevectorJob& x){p.swap(x.p);};
+        void swap(PrevectorJob& x) noexcept
+        {
+            p.swap(x.p);
+        };
     };
     CCheckQueue<PrevectorJob> queue {QUEUE_BATCH_SIZE};
     // The main thread should be counted to prevent thread oversubscription, and
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
@@ -42,7 +42,7 @@ struct FakeCheck {
     {
         return true;
     }
-    void swap(FakeCheck& x){};
+    void swap(FakeCheck& x) noexcept {};
 };
 
 struct FakeCheckCheckCompletion {
@@ -52,7 +52,7 @@ struct FakeCheckCheckCompletion {
         n_calls.fetch_add(1, std::memory_order_relaxed);
         return true;
     }
-    void swap(FakeCheckCheckCompletion& x){};
+    void swap(FakeCheckCheckCompletion& x) noexcept {};
 };
 
 struct FailingCheck {
@@ -63,7 +63,7 @@ struct FailingCheck {
     {
         return !fails;
     }
-    void swap(FailingCheck& x)
+    void swap(FailingCheck& x) noexcept
     {
         std::swap(fails, x.fails);
     };
@@ -81,7 +81,10 @@ struct UniqueCheck {
         results.insert(check_id);
         return true;
     }
-    void swap(UniqueCheck& x) { std::swap(x.check_id, check_id); };
+    void swap(UniqueCheck& x) noexcept
+    {
+        std::swap(x.check_id, check_id);
+    };
 };
 
 
@@ -109,7 +112,10 @@ struct MemoryCheck {
     {
         fake_allocated_memory.fetch_sub(b, std::memory_order_relaxed);
     };
-    void swap(MemoryCheck& x) { std::swap(b, x.b); };
+    void swap(MemoryCheck& x) noexcept
+    {
+        std::swap(b, x.b);
+    };
 };
 
 struct FrozenCleanupCheck {
@@ -133,7 +139,10 @@ struct FrozenCleanupCheck {
             cv.wait(l, []{ return nFrozen.load(std::memory_order_relaxed) == 0;});
         }
     }
-    void swap(FrozenCleanupCheck& x){std::swap(should_freeze, x.should_freeze);};
+    void swap(FrozenCleanupCheck& x) noexcept
+    {
+        std::swap(should_freeze, x.should_freeze);
+    };
 };
 
 // Static Allocations
diff --git a/src/test/fuzz/checkqueue.cpp b/src/test/fuzz/checkqueue.cpp
@@ -26,7 +26,7 @@ struct DumbCheck {
         return result;
     }
 
-    void swap(DumbCheck& x)
+    void swap(DumbCheck& x) noexcept
     {
     }
 };
diff --git a/src/test/fuzz/prevector.cpp b/src/test/fuzz/prevector.cpp
@@ -161,7 +161,7 @@ class prevector_tester
         pre_vector.shrink_to_fit();
     }
 
-    void swap()
+    void swap() noexcept
     {
         real_vector.swap(real_vector_alt);
         pre_vector.swap(pre_vector_alt);
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
@@ -165,7 +165,8 @@ class prevector_tester {
         test();
     }
 
-    void swap() {
+    void swap() noexcept
+    {
         real_vector.swap(real_vector_alt);
         pre_vector.swap(pre_vector_alt);
         test();

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)`
`39`	`39`	`{`
`40`	`40`	`return true;`
`41`	`41`	`}`
`42`		`- void swap(PrevectorJob& x){p.swap(x.p);};`
	`42`	`+ void swap(PrevectorJob& x) noexcept`
	`43`	`+ {`
	`44`	`+ p.swap(x.p);`
	`45`	`+ };`
`43`	`46`	`};`
`44`	`47`	`CCheckQueue<PrevectorJob> queue {QUEUE_BATCH_SIZE};`
`45`	`48`	`// The main thread should be counted to prevent thread oversubscription, and`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ struct FakeCheck {`
`42`	`42`	`{`
`43`	`43`	`return true;`
`44`	`44`	`}`
`45`		`- void swap(FakeCheck& x){};`
	`45`	`+ void swap(FakeCheck& x) noexcept {};`
`46`	`46`	`};`
`47`	`47`
`48`	`48`	`struct FakeCheckCheckCompletion {`
`@@ -52,7 +52,7 @@ struct FakeCheckCheckCompletion {`
`52`	`52`	`n_calls.fetch_add(1, std::memory_order_relaxed);`
`53`	`53`	`return true;`
`54`	`54`	`}`
`55`		`- void swap(FakeCheckCheckCompletion& x){};`
	`55`	`+ void swap(FakeCheckCheckCompletion& x) noexcept {};`
`56`	`56`	`};`
`57`	`57`
`58`	`58`	`struct FailingCheck {`
`@@ -63,7 +63,7 @@ struct FailingCheck {`
`63`	`63`	`{`
`64`	`64`	`return !fails;`
`65`	`65`	`}`
`66`		`- void swap(FailingCheck& x)`
	`66`	`+ void swap(FailingCheck& x) noexcept`
`67`	`67`	`{`
`68`	`68`	`std::swap(fails, x.fails);`
`69`	`69`	`};`
`@@ -81,7 +81,10 @@ struct UniqueCheck {`
`81`	`81`	`results.insert(check_id);`
`82`	`82`	`return true;`
`83`	`83`	`}`
`84`		`- void swap(UniqueCheck& x) { std::swap(x.check_id, check_id); };`
	`84`	`+ void swap(UniqueCheck& x) noexcept`
	`85`	`+ {`
	`86`	`+ std::swap(x.check_id, check_id);`
	`87`	`+ };`
`85`	`88`	`};`
`86`	`89`
`87`	`90`
`@@ -109,7 +112,10 @@ struct MemoryCheck {`
`109`	`112`	`{`
`110`	`113`	`fake_allocated_memory.fetch_sub(b, std::memory_order_relaxed);`
`111`	`114`	`};`
`112`		`- void swap(MemoryCheck& x) { std::swap(b, x.b); };`
	`115`	`+ void swap(MemoryCheck& x) noexcept`
	`116`	`+ {`
	`117`	`+ std::swap(b, x.b);`
	`118`	`+ };`
`113`	`119`	`};`
`114`	`120`
`115`	`121`	`struct FrozenCleanupCheck {`
`@@ -133,7 +139,10 @@ struct FrozenCleanupCheck {`
`133`	`139`	`cv.wait(l, []{ return nFrozen.load(std::memory_order_relaxed) == 0;});`
`134`	`140`	`}`
`135`	`141`	`}`
`136`		`- void swap(FrozenCleanupCheck& x){std::swap(should_freeze, x.should_freeze);};`
	`142`	`+ void swap(FrozenCleanupCheck& x) noexcept`
	`143`	`+ {`
	`144`	`+ std::swap(should_freeze, x.should_freeze);`
	`145`	`+ };`
`137`	`146`	`};`
`138`	`147`
`139`	`148`	`// Static Allocations`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ struct DumbCheck {`
`26`	`26`	`return result;`
`27`	`27`	`}`
`28`	`28`
`29`		`- void swap(DumbCheck& x)`
	`29`	`+ void swap(DumbCheck& x) noexcept`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`	`};`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ class prevector_tester`
`161`	`161`	`pre_vector.shrink_to_fit();`
`162`	`162`	`}`
`163`	`163`
`164`		`- void swap()`
	`164`	`+ void swap() noexcept`
`165`	`165`	`{`
`166`	`166`	`real_vector.swap(real_vector_alt);`
`167`	`167`	`pre_vector.swap(pre_vector_alt);`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ class prevector_tester {`
`165`	`165`	`test();`
`166`	`166`	`}`
`167`	`167`
`168`		`- void swap() {`
	`168`	`+ void swap() noexcept`
	`169`	`+ {`
`169`	`170`	`real_vector.swap(real_vector_alt);`
`170`	`171`	`pre_vector.swap(pre_vector_alt);`
`171`	`172`	`test();`