Improved queue stress test

diff --git a/test/stress/queue/push_pop.cpp b/test/stress/queue/push_pop.cpp
index 5720172d5dc24a57b5a65822e42c5b28fd096b28..fd0db8695eabe59154fb918483d4874dfeb451a1 100644 (file)
--- a/test/stress/queue/push_pop.cpp
+++ b/test/stress/queue/push_pop.cpp
@@ -174,10 +174,9 @@ namespace {
                         else
                             ++m_nBadWriter;
                     }
-                    else
+                    else {
                         ++m_nPopEmpty;
 
-                    if ( m_Queue.empty() ) {
                         if ( s_nProducerDone.load() >= nTotalWriters ) {
                             if ( m_Queue.empty() )
                                 break;

diff --git a/test/stress/queue/queue_type.h b/test/stress/queue/queue_type.h
index c4178fef20214b4fb0bcfe8d6a61b6d6593b54a7..4d7c3123efe713ce92c990952e9734baafe5ce98 100644 (file)
--- a/test/stress/queue/queue_type.h
+++ b/test/stress/queue/queue_type.h
@@ -418,6 +418,11 @@ namespace queue {
         typedef cds::container::RWQueue< Value, traits_RWQueue_mutex > RWQueue_mutex;
 
         // FCQueue
+        struct traits_FCQueue_stat:
+            public cds::container::fcqueue::make_traits<
+                cds::opt::stat< cds::container::fcqueue::stat<> >
+            >::type
+        {};
         struct traits_FCQueue_single_mutex_single_condvar:
             public cds::container::fcqueue::make_traits<
                 cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::single_mutex_single_condvar<>>
@@ -458,6 +463,7 @@ namespace queue {
         {};
 
         typedef cds::container::FCQueue< Value > FCQueue_deque;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_stat > FCQueue_deque_stat;
         typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_single_mutex_single_condvar> FCQueue_deque_wait_ss;
         typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_single_mutex_single_condvar_stat> FCQueue_deque_wait_ss_stat;
         typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_single_mutex_multi_condvar> FCQueue_deque_wait_sm;
@@ -468,7 +474,8 @@ namespace queue {
         typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_elimination > FCQueue_deque_elimination;
         typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_elimination_stat > FCQueue_deque_elimination_stat;
 
-        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value> >> FCQueue_list;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>> FCQueue_list;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_stat> FCQueue_list_stat;
         typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_single_mutex_single_condvar> FCQueue_list_wait_ss;
         typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_single_mutex_single_condvar_stat> FCQueue_list_wait_ss_stat;
         typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_single_mutex_multi_condvar> FCQueue_list_wait_sm;
@@ -721,6 +728,7 @@ namespace cds_test {
 
 #define CDSSTRESS_FCQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_deque ) \
+    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_stat ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_ss ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_ss_stat ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_sm ) \
@@ -730,6 +738,7 @@ namespace cds_test {
     CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_elimination ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_elimination_stat ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_list ) \
+    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_stat ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_ss ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_ss_stat ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_sm ) \