Refactors sequential test cases

diff --git a/test/stress/sequential/sequential_freelist_put_get.cpp b/test/stress/sequential/sequential_freelist_put_get.cpp
index 0767d75422266b00c7adb399e59530d8f267e3a4..04308c996882875432b1bee731bce8c01ee41a53 100644 (file)
--- a/test/stress/sequential/sequential_freelist_put_get.cpp
+++ b/test/stress/sequential/sequential_freelist_put_get.cpp
@@ -127,25 +127,16 @@ namespace {
             for ( auto& i : arr )
                 list.put( &i );
 
             for ( auto& i : arr )
                 list.put( &i );
 

-            pool.add( new Worker<FreeList>( pool, list ), s_nThreadCount );
-
-            propout() << std::make_pair( "work_thread", s_nThreadCount )
-                      << std::make_pair( "pass_count", s_nPassCount );
-
-            std::chrono::milliseconds duration = pool.run();
-
-            propout() << std::make_pair( "duration", duration );
+            std::unique_ptr<Worker<FreeList>> worker(
+                new Worker<FreeList>(pool, list));
+            worker->test();

 
             // analyze result
             size_t nTotal = 0;
             for ( auto const& i : arr )
                 nTotal += i.counter;
 
 
             // analyze result
             size_t nTotal = 0;
             for ( auto const& i : arr )
                 nTotal += i.counter;
 

-            size_t nSuccess = 0;
-            for ( size_t threadNo = 0; threadNo < pool.size(); ++threadNo )
-                nSuccess += static_cast<Worker<FreeList>&>( pool.get( threadNo )).m_nSuccess;
-
-            EXPECT_EQ( nSuccess, nTotal );
+            EXPECT_EQ( worker->m_nSuccess, nTotal );

 
             list.clear( []( typename FreeList::node* ) {} );
         }
 
             list.clear( []( typename FreeList::node* ) {} );
         }


@@ -154,12 +145,11 @@ namespace {
     size_t put_get::s_nThreadCount = 1;
     size_t put_get::s_nPassCount = 100000;
 
     size_t put_get::s_nThreadCount = 1;
     size_t put_get::s_nPassCount = 100000;
 

-#define CDSSTRESS_FREELIST_F( name, freelist_type ) \
-    TEST_F( put_get, name ) \
-    { \
-        freelist_type fl; \
-        test( fl ); \
-    }
+#define CDSSTRESS_FREELIST_F(name, freelist_type)                              \
+  TEST_F(put_get, name) {                                                      \
+    std::unique_ptr<freelist_type> fl(new freelist_type());                    \
+    test(*fl);                                                                 \
+  }

 
     CDSSTRESS_FREELIST_F( FreeList, cds::intrusive::FreeList )
 
 
     CDSSTRESS_FREELIST_F( FreeList, cds::intrusive::FreeList )
 


@@ -176,8 +166,9 @@ namespace {
 
         atomics::atomic<tagged_ptr> tp;
         if ( tp.is_lock_free()) {
 
         atomics::atomic<tagged_ptr> tp;
         if ( tp.is_lock_free()) {

-            cds::intrusive::TaggedFreeList fl;
-            test( fl );
+            using FL = cds::intrusive::TaggedFreeList;
+            std::unique_ptr<FL> fl(new FL());
+            test( *fl );

         }
         else
             std::cout << "Double-width CAS is not supported\n";
         }
         else
             std::cout << "Double-width CAS is not supported\n";

diff --git a/test/stress/sequential/sequential_freelist_put_get_single.cpp b/test/stress/sequential/sequential_freelist_put_get_single.cpp
index 9b7f68a22e81b66a190b3420782925115d6d1876..b8a00e3135723e3da8593a241be056dccdefa40f 100644 (file)
--- a/test/stress/sequential/sequential_freelist_put_get_single.cpp
+++ b/test/stress/sequential/sequential_freelist_put_get_single.cpp
@@ -84,7 +84,6 @@ namespace {
                 for ( size_t pass = 0; pass < s_nPassCount; ++pass ) {
                     item_type* p;
                     while ( (p = static_cast<item_type*>( m_FreeList.get())) == nullptr );
                 for ( size_t pass = 0; pass < s_nPassCount; ++pass ) {
                     item_type* p;
                     while ( (p = static_cast<item_type*>( m_FreeList.get())) == nullptr );

-                    p->counter.fetch_add( 1, atomics::memory_order_relaxed );

                     m_FreeList.put( p );
                 }
             }
                     m_FreeList.put( p );
                 }
             }


@@ -114,17 +113,9 @@ namespace {
             list.put( &item );
 
             pool.add( new Worker<FreeList>( pool, list ), s_nThreadCount );
             list.put( &item );
 
             pool.add( new Worker<FreeList>( pool, list ), s_nThreadCount );

-
-            propout() << std::make_pair( "work_thread", s_nThreadCount )
-                      << std::make_pair( "pass_count", s_nPassCount );
-
-            std::chrono::milliseconds duration = pool.run();
-
-            propout() << std::make_pair( "duration", duration );
-
-            // analyze result
-            EXPECT_EQ( item.counter.load( atomics::memory_order_relaxed ), s_nPassCount * s_nThreadCount );
-
+            std::unique_ptr<Worker<FreeList>> worker(
+                new Worker<FreeList>(pool, list));
+            worker->test();

             list.clear( []( typename FreeList::node* ) {} );
         }
     };
             list.clear( []( typename FreeList::node* ) {} );
         }
     };


@@ -132,12 +123,11 @@ namespace {
     size_t put_get_single::s_nThreadCount = 1;
     size_t put_get_single::s_nPassCount = 100000;
 
     size_t put_get_single::s_nThreadCount = 1;
     size_t put_get_single::s_nPassCount = 100000;
 

-#define CDSSTRESS_FREELIST_F( name, freelist_type ) \
-    TEST_F( put_get_single, name ) \
-    { \
-        freelist_type fl; \
-        test( fl ); \
-    }
+#define CDSSTRESS_FREELIST_F(name, freelist_type)                              \
+  TEST_F(put_get_single, name) {                                               \
+    std::unique_ptr<freelist_type> fl(new freelist_type());                    \
+    test(*fl);                                                                 \
+  }

 
     CDSSTRESS_FREELIST_F( FreeList, cds::intrusive::FreeList )
 
 
     CDSSTRESS_FREELIST_F( FreeList, cds::intrusive::FreeList )
 


@@ -154,8 +144,9 @@ namespace {
 
         atomics::atomic<tagged_ptr> tp;
         if ( tp.is_lock_free()) {
 
         atomics::atomic<tagged_ptr> tp;
         if ( tp.is_lock_free()) {

-            cds::intrusive::TaggedFreeList fl;
-            test( fl );
+            using FL = cds::intrusive::TaggedFreeList;
+            std::unique_ptr<FL> fl(new FL());
+            test( *fl );

         }
         else
             std::cout << "Double-width CAS is not supported\n";
         }
         else
             std::cout << "Double-width CAS is not supported\n";

diff --git a/test/stress/sequential/sequential_queue.cpp b/test/stress/sequential/sequential_queue.cpp
index 4fe932a58ae37089bdc8b79f44af0d79ecab35b9..6e8760d542dd1c286106ed54704f6c3f155217b3 100644 (file)
--- a/test/stress/sequential/sequential_queue.cpp
+++ b/test/stress/sequential/sequential_queue.cpp
@@ -106,8 +106,8 @@ using simple_sequential_queue = sequential_queue<>;
 #define CDSSTRESS_Sequential_Queue_F(test_fixture, type_name)                  \
   TEST_F(test_fixture, type_name) {                                            \
     typedef queue::Types<value_type>::type_name queue_type;                    \
 #define CDSSTRESS_Sequential_Queue_F(test_fixture, type_name)                  \
   TEST_F(test_fixture, type_name) {                                            \
     typedef queue::Types<value_type>::type_name queue_type;                    \

-    queue_type queue(s_nQueueSize);                                            \
-    test(queue, s_nVyukovQueuePushCount);                                      \
+    std::unique_ptr<queue_type> queue(new queue_type(s_nQueueSize));           \
+    test(*queue, s_nVyukovQueuePushCount);                                     \

   }
 
 #define CDSSTRESS_Sequential_VyukovQueue(test_fixture)                         \
   }
 
 #define CDSSTRESS_Sequential_VyukovQueue(test_fixture)                         \


@@ -120,8 +120,8 @@ CDSSTRESS_Sequential_VyukovQueue(simple_sequential_queue);
 #define CDSSTRESS_Sequential_Queue_F(test_fixture, type_name)                  \
   TEST_F(test_fixture, type_name) {                                            \
     typedef queue::Types<value_type>::type_name queue_type;                    \
 #define CDSSTRESS_Sequential_Queue_F(test_fixture, type_name)                  \
   TEST_F(test_fixture, type_name) {                                            \
     typedef queue::Types<value_type>::type_name queue_type;                    \

-    queue_type queue;                                                          \
-    test(queue);                                                               \
+    std::unique_ptr<queue_type> queue(new queue_type());                       \
+    test(*queue);                                                              \

   }
 
 #define CDSSTRESS_Sequential_MSQueue(test_fixture)                             \
   }
 
 #define CDSSTRESS_Sequential_MSQueue(test_fixture)                             \


@@ -290,8 +290,8 @@ public:
 #define CDSSTRESS_Sequential_Queue_F(test_fixture, type_name)                  \
   TEST_F(test_fixture, type_name) {                                            \
     typedef queue::Types<value_type>::type_name queue_type;                    \
 #define CDSSTRESS_Sequential_Queue_F(test_fixture, type_name)                  \
   TEST_F(test_fixture, type_name) {                                            \
     typedef queue::Types<value_type>::type_name queue_type;                    \

-    queue_type queue(s_nBufferSize);                                           \
-    test(queue);                                                               \
+    std::unique_ptr<queue_type> queue(new queue_type(s_nBufferSize));          \
+    test(*queue);                                                              \

   }
 
 CDSSTRESS_WeakRingBuffer_void(sequential_weak_ring_buffer)
   }
 
 CDSSTRESS_WeakRingBuffer_void(sequential_weak_ring_buffer)

diff --git a/test/stress/sequential/sequential_stack.cpp b/test/stress/sequential/sequential_stack.cpp
index 48287ef8de7d31d1da605ccb2f0f5bb3dc08a9a0..b3598e3dcdfe0f784eb3dbd67dfc44875c2ad1ca 100644 (file)
--- a/test/stress/sequential/sequential_stack.cpp
+++ b/test/stress/sequential/sequential_stack.cpp
@@ -40,15 +40,16 @@ namespace {
 #define CDSSTRESS_SequentialTreiberStack_F(test_fixture, type_name)            \
   TEST_F(test_fixture, type_name) {                                            \
     typedef stack::Types<value_type>::type_name stack_type;                    \
 #define CDSSTRESS_SequentialTreiberStack_F(test_fixture, type_name)            \
   TEST_F(test_fixture, type_name) {                                            \
     typedef stack::Types<value_type>::type_name stack_type;                    \

-    stack_type stack;                                                          \
-    test(stack);                                                               \
+    std::unique_ptr<stack_type> stack(new stack_type());                       \
+    test(*stack);                                                              \

   }
 
 #define CDSSTRESS_SequentialEliminationStack_F(test_fixture, type_name)        \
   TEST_F(test_fixture, type_name) {                                            \
     typedef stack::Types<value_type>::type_name stack_type;                    \
   }
 
 #define CDSSTRESS_SequentialEliminationStack_F(test_fixture, type_name)        \
   TEST_F(test_fixture, type_name) {                                            \
     typedef stack::Types<value_type>::type_name stack_type;                    \

-    stack_type stack(s_nSequentialEliminationSize);                            \
-    test(stack);                                                               \
+    std::unique_ptr<stack_type> stack(                                         \
+        new stack_type(s_nSequentialEliminationSize));                         \
+    test(*stack);                                                              \

   }
 
 #define CDSSTRESS_SequentialTreiberStack(test_fixture)                         \
   }
 
 #define CDSSTRESS_SequentialTreiberStack(test_fixture)                         \


@@ -81,7 +82,8 @@ protected:
     GetConfig(SequentialEliminationSize);
   }
 
     GetConfig(SequentialEliminationSize);
   }
 

-  template <typename Stack> void test(Stack &stack) {
+  template <typename Stack>
+  void test(Stack &stack) {

     size_t push_error_cnt = 0;
     size_t pop_sum = 0;
     value_type v;
     size_t push_error_cnt = 0;
     size_t pop_sum = 0;
     value_type v;


@@ -109,7 +111,7 @@ protected:
   }
 };
 
   }
 };
 

-CDSSTRESS_SequentialTreiberStack(sequential_stack)
-    CDSSTRESS_SequentialEliminationStack(sequential_stack)
+CDSSTRESS_SequentialTreiberStack(sequential_stack);
+CDSSTRESS_SequentialEliminationStack(sequential_stack);

 
 } // namespace
 
 } // namespace