Refactors lock test cases backoff values

diff --git a/cds/misc/mcs-lock.h b/cds/misc/mcs-lock.h
index d5cda3a688f0b1729f309b0c6cb916bc32904135..a6eb04e63556a99189d112c690ef94f843785a3c 100644 (file)
--- a/cds/misc/mcs-lock.h
+++ b/cds/misc/mcs-lock.h
@@ -8,9 +8,6 @@
 
 namespace cds_others {
 
-size_t BackoffTraits::lower_bound = 16;
-size_t BackoffTraits::upper_bound = 1024;
-
 // Forward declaration
 struct mcs_node;
 struct mcs_mutex;

diff --git a/test/stress/misc/CMakeLists.txt b/test/stress/misc/CMakeLists.txt
index 437387104b6f953aece61824a4fdab661afe739f..8d15dd9878fc85de3fa7ee4471a5782af9909f11 100644 (file)
--- a/test/stress/misc/CMakeLists.txt
+++ b/test/stress/misc/CMakeLists.txt
@@ -8,6 +8,7 @@ set(CDSSTRESS_STACK_SOURCES
     seqlock_driver.cpp
     rwlock_driver.cpp
     mcslock_driver.cpp
+    backoff.cpp
 )
 
 include_directories(

diff --git a/test/stress/misc/backoff.cpp b/test/stress/misc/backoff.cpp
new file mode 100644 (file)
index 0000000..85c014c
--- /dev/null
+++ b/test/stress/misc/backoff.cpp
@@ -0,0 +1,15 @@
+#include "common.h"
+#include <atomic>
+#include <cds/gc/dhp.h>
+#include <cds/gc/hp.h>
+#include <cds/misc/backoff.h>
+#include <cds_test/stress_test.h>
+#include <iostream>
+#include <memory>
+
+namespace cds_others {
+
+size_t BackoffTraits::lower_bound = 16;
+size_t BackoffTraits::upper_bound = 1024;
+
+} // namespace cds_others

diff --git a/test/stress/sequential/sequential-misc/CMakeLists.txt b/test/stress/sequential/sequential-misc/CMakeLists.txt
index 15646c613da0482b56ec3a319d59e8a59710ab1c..a6f00642a61ffc89c687be19e057731a163d0ba9 100644 (file)
--- a/test/stress/sequential/sequential-misc/CMakeLists.txt
+++ b/test/stress/sequential/sequential-misc/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(PACKAGE_NAME stress-sequential-misc)
 
-set(CDSSTRESS_STACK_SOURCES
+set(CDSSTRESS_MISC_SOURCES
     main.cpp
     rigtorp_spsc_driver.cpp
     rigtorp_mpmc_driver.cpp
@@ -9,13 +9,14 @@ set(CDSSTRESS_STACK_SOURCES
     seqlock_driver.cpp
     rwlock_driver.cpp
     mcslock_driver.cpp
+    backoff.cpp
 )
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_executable(${PACKAGE_NAME} ${CDSSTRESS_STACK_SOURCES})
+add_executable(${PACKAGE_NAME} ${CDSSTRESS_MISC_SOURCES})
 target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES} ${CDSSTRESS_FRAMEWORK_LIBRARY})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})

diff --git a/test/stress/sequential/sequential-misc/backoff.cpp b/test/stress/sequential/sequential-misc/backoff.cpp
new file mode 100644 (file)
index 0000000..85c014c
--- /dev/null
+++ b/test/stress/sequential/sequential-misc/backoff.cpp
@@ -0,0 +1,15 @@
+#include "common.h"
+#include <atomic>
+#include <cds/gc/dhp.h>
+#include <cds/gc/hp.h>
+#include <cds/misc/backoff.h>
+#include <cds_test/stress_test.h>
+#include <iostream>
+#include <memory>
+
+namespace cds_others {
+
+size_t BackoffTraits::lower_bound = 16;
+size_t BackoffTraits::upper_bound = 1024;
+
+} // namespace cds_others

diff --git a/test/stress/sequential/sequential-misc/mcslock_driver.cpp b/test/stress/sequential/sequential-misc/mcslock_driver.cpp
index 576193f542936be1ffecd74b62ac5cfaf590016e..a4a9d1728a131e6a8757f7f66daa8925bd96e83b 100644 (file)
--- a/test/stress/sequential/sequential-misc/mcslock_driver.cpp
+++ b/test/stress/sequential/sequential-misc/mcslock_driver.cpp
@@ -29,6 +29,8 @@ protected:
 ullong MCSLockTest::x;
 
 TEST_F(MCSLockTest, MCSLock) {
+  cds_others::BackoffTraits::lower_bound = 16;
+  cds_others::BackoffTraits::upper_bound = 1024;
   std::unique_ptr<cds_others::mcs_mutex> my_mutex(new cds_others::mcs_mutex());
   cds_others::mcs_mutex::guard g(my_mutex.get());
   my_mutex->unlock(&g);