projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trims down unnecessary queue test casese
[libcds.git]
/
test
/
stress
/
queue
/
push.cpp
diff --git
a/test/stress/queue/push.cpp
b/test/stress/queue/push.cpp
index f9ba12165dcb0291665aa05f702f9aaf6205cccd..57bb3697d8a30b441232de19a1eedc91c2244c8d 100644
(file)
--- a/
test/stress/queue/push.cpp
+++ b/
test/stress/queue/push.cpp
@@
-1,7
+1,7
@@
/*
This file is a part of libcds - Concurrent Data Structures library
/*
This file is a part of libcds - Concurrent Data Structures library
- (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-201
6
+ (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-201
7
Source code repo: http://github.com/khizmax/libcds/
Download: http://sourceforge.net/projects/libcds/files/
Source code repo: http://github.com/khizmax/libcds/
Download: http://sourceforge.net/projects/libcds/files/
@@
-102,9
+102,9
@@
namespace {
s_nThreadCount = cfg.get_size_t( "ThreadCount", s_nThreadCount );
s_nQueueSize = cfg.get_size_t( "QueueSize", s_nQueueSize );
s_nThreadCount = cfg.get_size_t( "ThreadCount", s_nThreadCount );
s_nQueueSize = cfg.get_size_t( "QueueSize", s_nQueueSize );
- if ( s_nThreadCount == 0 )
+ if ( s_nThreadCount == 0
u
)
s_nThreadCount = 1;
s_nThreadCount = 1;
- if ( s_nQueueSize == 0 )
+ if ( s_nQueueSize == 0
u
)
s_nQueueSize = 1000;
}
s_nQueueSize = 1000;
}
@@
-148,9
+148,9
@@
namespace {
for ( size_t i = 0; i < pool.size(); ++i ) {
Producer<Queue>& thread = static_cast<Producer<Queue>&>(pool.get( i ));
for ( size_t i = 0; i < pool.size(); ++i ) {
Producer<Queue>& thread = static_cast<Producer<Queue>&>(pool.get( i ));
- EXPECT_EQ( thread.m_nPushError, 0 ) << " producer thread " << i;
+ EXPECT_EQ( thread.m_nPushError, 0
u
) << " producer thread " << i;
}
}
- EXPECT_TRUE( !q.empty()
);
+ EXPECT_TRUE( !q.empty());
std::unique_ptr< uint8_t[] > arr( new uint8_t[s_nQueueSize] );
memset( arr.get(), 0, sizeof(arr[0]) * s_nQueueSize );
std::unique_ptr< uint8_t[] > arr( new uint8_t[s_nQueueSize] );
memset( arr.get(), 0, sizeof(arr[0]) * s_nQueueSize );
@@
-173,22
+173,17
@@
namespace {
CDSSTRESS_MoirQueue( queue_push )
CDSSTRESS_BasketQueue( queue_push )
CDSSTRESS_OptimsticQueue( queue_push )
CDSSTRESS_MoirQueue( queue_push )
CDSSTRESS_BasketQueue( queue_push )
CDSSTRESS_OptimsticQueue( queue_push )
- CDSSTRESS_FCQueue( queue_push )
- CDSSTRESS_FCDeque( queue_push )
CDSSTRESS_RWQueue( queue_push )
CDSSTRESS_RWQueue( queue_push )
- CDSSTRESS_StdQueue( queue_push )
#undef CDSSTRESS_Queue_F
#undef CDSSTRESS_Queue_F
-#define CDSSTRESS_Queue_F( test_fixture, type_name
, level
) \
+#define CDSSTRESS_Queue_F( test_fixture, type_name ) \
TEST_F( test_fixture, type_name ) \
{ \
TEST_F( test_fixture, type_name ) \
{ \
- if ( !check_detail_level( level )) return; \
typedef queue::Types< value_type >::type_name queue_type; \
queue_type queue( s_nQueueSize ); \
test( queue ); \
}
typedef queue::Types< value_type >::type_name queue_type; \
queue_type queue( s_nQueueSize ); \
test( queue ); \
}
- CDSSTRESS_TsigasQueue( queue_push )
CDSSTRESS_VyukovQueue( queue_push )
#undef CDSSTRESS_Queue_F
CDSSTRESS_VyukovQueue( queue_push )
#undef CDSSTRESS_Queue_F
@@
-237,18
+232,28
@@
namespace {
}
};
}
};
-#define CDSSTRESS_Queue_F( test_fixture, type_name
, level
) \
+#define CDSSTRESS_Queue_F( test_fixture, type_name ) \
TEST_P( test_fixture, type_name ) \
{ \
TEST_P( test_fixture, type_name ) \
{ \
- if ( !check_detail_level( level )) return; \
typedef typename queue::Types<value_type>::type_name queue_type; \
test< queue_type >(); \
}
CDSSTRESS_SegmentedQueue( segmented_queue_push )
typedef typename queue::Types<value_type>::type_name queue_type; \
test< queue_type >(); \
}
CDSSTRESS_SegmentedQueue( segmented_queue_push )
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+ static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+ {
+ return std::to_string( p.param );
+ }
INSTANTIATE_TEST_CASE_P( SQ,
segmented_queue_push,
INSTANTIATE_TEST_CASE_P( SQ,
segmented_queue_push,
- ::testing::ValuesIn( segmented_queue_push::get_test_parameters()));
+ ::testing::ValuesIn( segmented_queue_push::get_test_parameters()), get_test_parameter_name );
+#else
+ INSTANTIATE_TEST_CASE_P( SQ,
+ segmented_queue_push,
+ ::testing::ValuesIn( segmented_queue_push::get_test_parameters()));
+#endif
+
} // namespace
} // namespace