/*
This file is a part of libcds - Concurrent Data Structures library
- (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+ (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
Source code repo: http://github.com/khizmax/libcds/
Download: http://sourceforge.net/projects/libcds/files/
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "pqueue_type.h"
m_arr.reserve( nEnd - nStart );
for ( size_t i = nStart; i < nEnd; ++i )
m_arr.push_back( i );
- shuffle( m_arr.begin(), m_arr.end() );
+ shuffle( m_arr.begin(), m_arr.end());
}
public:
virtual void test()
{
typename PQueue::value_type val;
- while ( s_nProducerCount.load( atomics::memory_order_relaxed ) != 0 || !m_Queue.empty() ) {
+ while ( s_nProducerCount.load( atomics::memory_order_relaxed ) != 0 || !m_Queue.empty()) {
if ( m_Queue.pop( val ))
++m_nPopSuccess;
else
assert( t.type() == producer_thread );
Producer<PQueue>& prod = static_cast<Producer<PQueue>&>(t);
nPushFailed += prod.m_nPushError;
- EXPECT_EQ( prod.m_nPushError , 0 ) << "producer " << i;
+ EXPECT_EQ( prod.m_nPushError , 0u ) << "producer " << i;
}
}
<< std::make_pair( "push_error", nPushFailed );
EXPECT_EQ( nTotalPopped, s_nQueueSize );
- EXPECT_EQ( nPushFailed, 0 );
+ EXPECT_EQ( nPushFailed, 0u );
- //check_statistics( testQueue.statistics() );
+ //check_statistics( testQueue.statistics());
propout() << q.statistics();
}
public:
- static void SetUpTestCase()\r
- {\r
- cds_test::config const& cfg = get_config( "pqueue_push_pop" );\r
-\r
+ static void SetUpTestCase()
+ {
+ cds_test::config const& cfg = get_config( "pqueue_push_pop" );
+
s_nPushThreadCount = cfg.get_size_t( "PushThreadCount", s_nPushThreadCount );
s_nPopThreadCount = cfg.get_size_t( "PopThreadCount", s_nPopThreadCount );
s_nQueueSize = cfg.get_size_t( "QueueSize", s_nQueueSize );
- if ( s_nPushThreadCount == 0 )
+ if ( s_nPushThreadCount == 0u )
s_nPushThreadCount = 1;
- if ( s_nPopThreadCount == 0 )
+ if ( s_nPopThreadCount == 0u )
s_nPopThreadCount = 1;
- if ( s_nQueueSize == 0 )
- s_nQueueSize = 1000;\r
+ if ( s_nQueueSize == 0u )
+ s_nQueueSize = 1000;
}
//static void TearDownTestCase();
test( pq ); \
}
CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_less )
- CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_less_stat )
CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_cmp )
- CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_mutex )
+ //CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_mutex ) // too slow
#define CDSSTRESS_MSPriorityQueue_static( fixture_t, pqueue_t ) \
TEST_F( fixture_t, pqueue_t ) \
{ \
typedef pqueue::Types<pqueue::simple_value>::pqueue_t pqueue_type; \
std::unique_ptr< pqueue_type > pq( new pqueue_type ); \
- test( *pq.get() ); \
+ test( *pq.get()); \
}
//CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_static_less )
//CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_static_less_stat )
//CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_static_cmp )
- //CDSSTRESS_MSPriorityQueue( pqueue_push_pop, 1MSPriorityQueue_static_mutex )
+ //CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_static_mutex )
#define CDSSTRESS_PriorityQueue( fixture_t, pqueue_t ) \
pqueue_type pq; \
test( pq ); \
}
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_vector )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_vector_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_deque )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_deque_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_deque )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_deque_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_stable_vector )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_stable_vector_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_max_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_min_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_max_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_min_stat )
// CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_max )
// CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_max_stat )
// CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_min )
// CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_min_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_max_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_min_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_max_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_min_stat )
#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_max_stat )
CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_min_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_max_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_min_stat )
#endif
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_max_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_min_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_max_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_min_stat )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpi_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpi_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpb_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpb_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpt_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpt_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpi_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpi_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpb_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_RCU_gpb_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_RCU_gpb_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpb_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_RCU_gpb_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_RCU_gpb_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpt_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpt_min )
#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_shb_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_shb_min )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_sht_max )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_sht_min )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_shb_max )
+ CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_shb_min )
#endif
CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_vector_spin )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_vector_mutex )
CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_deque_spin )
- CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_deque_mutex )
} // namespace
projects / libcds.git / blobdiff