From ffaea502f2db24e85c1c69680a39dd142b348bfe Mon Sep 17 00:00:00 2001 From: Peizhao Ou Date: Thu, 22 Feb 2018 02:01:56 -0800 Subject: [PATCH 1/1] Runs fewer test cases (only 2 threads) --- test/stress/queue/push_pop.cpp | 5 ++++- test/stress/queue/queue_type.h | 1 - test/stress/queue/spsc_queue.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/stress/queue/push_pop.cpp b/test/stress/queue/push_pop.cpp index b12a1998..b449ccb8 100644 --- a/test/stress/queue/push_pop.cpp +++ b/test/stress/queue/push_pop.cpp @@ -40,6 +40,7 @@ namespace { static size_t s_nConsumerThreadCount = 4; static size_t s_nProducerThreadCount = 4; static size_t s_nQueueSize = 4000000; + static size_t s_nSegmentedQueueSize = 400000; static size_t s_nVyukovQueueSize = 40000; static size_t s_nHeavyValueSize = 100; @@ -327,6 +328,7 @@ namespace { s_nProducerThreadCount = cfg.get_size_t( "ProducerCount", s_nProducerThreadCount ); s_nQueueSize = cfg.get_size_t( "QueueSize", s_nQueueSize ); s_nVyukovQueueSize = cfg.get_size_t( "VyukovQueueSize", s_nVyukovQueueSize ); + s_nSegmentedQueueSize = cfg.get_size_t( "SegmentedQueueSize", s_nSegmentedQueueSize ); s_nHeavyValueSize = cfg.get_size_t( "HeavyValueSize", s_nHeavyValueSize ); if ( s_nConsumerThreadCount == 0u ) @@ -365,7 +367,7 @@ namespace { s_nQueueSize = old_queue_size; \ } - CDSSTRESS_VyukovQueue( simple_queue_push_pop ) + //CDSSTRESS_VyukovQueue( simple_queue_push_pop ) #undef CDSSTRESS_Queue_F @@ -419,6 +421,7 @@ namespace { TEST_P( test_fixture, type_name ) \ { \ typedef typename queue::Types::type_name queue_type; \ + s_nQueueSize = s_nSegmentedQueueSize; \ test< queue_type >(); \ } diff --git a/test/stress/queue/queue_type.h b/test/stress/queue/queue_type.h index bcb14b76..980f9f9d 100644 --- a/test/stress/queue/queue_type.h +++ b/test/stress/queue/queue_type.h @@ -802,7 +802,6 @@ namespace cds_test { #define CDSSTRESS_SegmentedQueue( test_fixture ) \ CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin ) \ - CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin_padding ) \ CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin ) \ CDSSTRESS_SegmentedQueue_1( test_fixture ) diff --git a/test/stress/queue/spsc_queue.cpp b/test/stress/queue/spsc_queue.cpp index 4fa440a6..6b9fbe61 100644 --- a/test/stress/queue/spsc_queue.cpp +++ b/test/stress/queue/spsc_queue.cpp @@ -220,7 +220,7 @@ namespace { CDSSTRESS_WeakRingBuffer( spsc_queue ) CDSSTRESS_VyukovQueue( spsc_queue ) - CDSSTRESS_VyukovSingleConsumerQueue( spsc_queue ) +// CDSSTRESS_VyukovSingleConsumerQueue( spsc_queue ) #undef CDSSTRESS_Queue_F -- 2.34.1