projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disables running some stat analysis for benchmarks & Adds some sequential data structures
[libcds.git]
/
test
/
stress
/
queue
/
push.cpp
diff --git
a/test/stress/queue/push.cpp
b/test/stress/queue/push.cpp
index de3a5ae54e2be8a1230975bebb3eaa63b431eaa4..398ca66b197631ba53e1d9ec31310c5093461a2e 100644
(file)
--- a/
test/stress/queue/push.cpp
+++ b/
test/stress/queue/push.cpp
@@
-29,6
+29,7
@@
*/
#include "queue_type.h"
*/
#include "queue_type.h"
+#include "../misc/common.h"
// Multi-threaded queue test for push operation
namespace {
// Multi-threaded queue test for push operation
namespace {
@@
-135,7
+136,7
@@
namespace {
propout() << std::make_pair( "duration", duration );
propout() << std::make_pair( "duration", duration );
-
analyze( q
);
+
DEBUG(analyze( q )
);
propout() << q.statistics();
}
propout() << q.statistics();
}
@@
-173,10
+174,7
@@
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
#define CDSSTRESS_Queue_F( test_fixture, type_name ) \
#undef CDSSTRESS_Queue_F
#define CDSSTRESS_Queue_F( test_fixture, type_name ) \
@@
-244,8
+242,19
@@
namespace {
CDSSTRESS_SegmentedQueue( segmented_queue_push )
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