Refactors some of existing cds multi-threaded stress test cases

[libcds.git] / test / stress / misc / mcslock_driver.cpp

diff --git a/test/stress/misc/mcslock_driver.cpp b/test/stress/misc/mcslock_driver.cpp
index 1435e971512cffe2cced76e125298b95debb1e80..9a51077ae6c6df9c9445995adf1f31ed5131e5af 100644 (file)
--- a/test/stress/misc/mcslock_driver.cpp
+++ b/test/stress/misc/mcslock_driver.cpp
@@ -2,16 +2,17 @@
 #include <atomic>
 #include <cds/gc/dhp.h>
 #include <cds/gc/hp.h>
-#include <cds/sync/mcs-lock.h>
+#include <cds/misc/mcs-lock.h>
 #include <cds_test/stress_test.h>
 #include <iostream>
+#include <memory>
 #include <thread>
 
 using namespace std;
 
 namespace {
 
-static size_t s_nMCSLockThreadCount = 6;
+static size_t s_nMCSLockThreadCount = 4;
 static size_t s_nMCSLockPassCount = 3000000;
 
 class MCSLockTest : public cds_test::stress_fixture {
@@ -27,11 +28,10 @@ protected:
 
   static void Thread() {
     cds_others::mcs_mutex::guard g(my_mutex);
-    x = 1;
     my_mutex->unlock(&g);
     for (ullong i = 0; i < s_nMCSLockPassCount; i++) {
       my_mutex->lock(&g);
-      x = i;
+      x++;
       my_mutex->unlock(&g);
     }
     my_mutex->lock(&g);
@@ -43,14 +43,18 @@ cds_others::mcs_mutex *MCSLockTest::my_mutex;
 
 TEST_F(MCSLockTest, BasicLockUnlock) {
   my_mutex = new cds_others::mcs_mutex();
-  std::thread *threads = new std::thread[s_nMCSLockThreadCount];
-  for (int i = 0; i < s_nMCSLockThreadCount; i++) {
+  x = 0;
+  std::unique_ptr<std::thread[]> threads(
+      new std::thread[s_nMCSLockThreadCount]);
+  for (size_t i = 0; i < s_nMCSLockThreadCount; i++) {
     threads[i] = std::thread(Thread);
   }
-
-  for (int i = 0; i < s_nMCSLockThreadCount; i++) {
+  for (size_t i = 0; i < s_nMCSLockThreadCount; i++) {
     threads[i].join();
   }
+  if (x != s_nMCSLockPassCount * s_nMCSLockThreadCount) {
+    cout << "MCS lock incorrect\n";
+  }
 }
 
 } // namespace