From 173f94ff798becc6d4dbcdfa3289856214203803 Mon Sep 17 00:00:00 2001
From: Peizhao Ou <peizhaoo@uci.edu>
Date: Tue, 30 Jan 2018 00:45:41 -0800
Subject: [PATCH] Refactors lock test cases backoff values

---
 cds/misc/mcs-lock.h                               |  3 ---
 test/stress/misc/CMakeLists.txt                   |  1 +
 test/stress/misc/backoff.cpp                      | 15 +++++++++++++++
 .../sequential/sequential-misc/CMakeLists.txt     |  5 +++--
 .../stress/sequential/sequential-misc/backoff.cpp | 15 +++++++++++++++
 .../sequential/sequential-misc/mcslock_driver.cpp |  2 ++
 6 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 test/stress/misc/backoff.cpp
 create mode 100644 test/stress/sequential/sequential-misc/backoff.cpp

diff --git a/cds/misc/mcs-lock.h b/cds/misc/mcs-lock.h
index d5cda3a6..a6eb04e6 100644
--- 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 43738710..8d15dd98 100644
--- 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
index 00000000..85c014c9
--- /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 15646c61..a6f00642 100644
--- 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
index 00000000..85c014c9
--- /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 576193f5..a4a9d172 100644
--- 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);
-- 
2.34.1