Refactors sequential misc test cases

[libcds.git] / test / stress / sequential / sequential-misc / seqlock_driver.cpp

diff --git a/test/stress/sequential/sequential-misc/seqlock_driver.cpp b/test/stress/sequential/sequential-misc/seqlock_driver.cpp
index f3680b64b390f8bcc9ee01de042873991e1caddd..3a7d865dc050fdefbc3b795f163c37829b32e93d 100644 (file)
--- a/test/stress/sequential/sequential-misc/seqlock_driver.cpp
+++ b/test/stress/sequential/sequential-misc/seqlock_driver.cpp
@@ -2,7 +2,7 @@
 #include <atomic>
 #include <cds/gc/dhp.h>
 #include <cds/gc/hp.h>
-#include <cds/sync/seqlock.h>
+#include <cds/misc/seqlock.h>
 #include <cds_test/stress_test.h>
 #include <iostream>
 #include <memory>
@@ -20,7 +20,6 @@ static size_t s_nSeqLockPassCount = 2000000;
 class SeqLockTest : public cds_test::stress_fixture {
 protected:
   static size_t sum;
-  static SeqLock *seqlock;
 
   static void SetUpTestCase() {
     cds_test::config const &cfg = get_config("SequentialMisc");
@@ -28,7 +27,7 @@ protected:
     GetConfig(SeqLockPassCount);
   }
 
-  static void ReaderWriterThread(int write_percentage) {
+  static void ReaderWriterThread(SeqLock *seqlock, int write_percentage) {
     for (size_t i = 0; i < s_nSeqLockPassCount; i++) {
       if (rand(100) < write_percentage) {
         sum += seqlock->read();
@@ -40,12 +39,11 @@ protected:
 };
 
 size_t SeqLockTest::sum;
-SeqLock *SeqLockTest::seqlock;
 
 TEST_F(SeqLockTest, SeqLock) {
-  seqlock = new SeqLock();
+  std::unique_ptr<SeqLock> seqlock(new SeqLock());
   for (int write_percentage = 5; write_percentage < 50; write_percentage += 5) {
-    ReaderWriterThread(write_percentage);
+    ReaderWriterThread(seqlock.get(), write_percentage);
   }
 }