projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
07fe8c4
)
Trims down unnecessary test cases for Stacks
author
Peizhao Ou
<peizhaoo@uci.edu>
Wed, 29 Nov 2017 08:38:25 +0000
(
00:38
-0800)
committer
Peizhao Ou
<peizhaoo@uci.edu>
Wed, 29 Nov 2017 08:38:25 +0000
(
00:38
-0800)
test/stress/stack/intrusive_push_pop.cpp
patch
|
blob
|
history
test/stress/stack/intrusive_stack_type.h
patch
|
blob
|
history
test/stress/stack/push.cpp
patch
|
blob
|
history
test/stress/stack/push_pop.cpp
patch
|
blob
|
history
test/stress/stack/stack_type.h
patch
|
blob
|
history
diff --git
a/test/stress/stack/intrusive_push_pop.cpp
b/test/stress/stack/intrusive_push_pop.cpp
index 176f20ff72657bfeaeeace489eecdbbb53899e1e..1b42e4bba67c491d5051c93ee00f47f2ccb60993 100644
(file)
--- a/
test/stress/stack/intrusive_push_pop.cpp
+++ b/
test/stress/stack/intrusive_push_pop.cpp
@@
-173,7
+173,7
@@
namespace {
test_std< stack_type >(); \
}
test_std< stack_type >(); \
}
- CDSSTRESS_StdStack( intrusive_stack_push_pop )
+
//
CDSSTRESS_StdStack( intrusive_stack_push_pop )
#undef CDSSTRESS_Stack_F
#undef CDSSTRESS_Stack_F
diff --git
a/test/stress/stack/intrusive_stack_type.h
b/test/stress/stack/intrusive_stack_type.h
index 87cdba5cda922fdff7b1cfa49b783e8794c05d2f..e33506e1725fb306b1d56fad7184c0b85e301860 100644
(file)
--- a/
test/stress/stack/intrusive_stack_type.h
+++ b/
test/stress/stack/intrusive_stack_type.h
@@
-413,66
+413,43
@@
namespace cds_test {
#define CDSSTRESS_TreiberStack_HP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP ) \
#define CDSSTRESS_TreiberStack_HP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_HP_seqcst ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP_pause ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_HP_exp ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_HP_stat ) \
+ CDSSTRESS_Stack_F( test_fixture, Treiber_HP_exp )
#define CDSSTRESS_TreiberStack_DHP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_pause ) \
#define CDSSTRESS_TreiberStack_DHP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_pause ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_exp ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_stat )
+ CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_exp )
#define CDSSTRESS_EliminationStack_HP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_2ms ) \
#define CDSSTRESS_EliminationStack_HP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_2ms ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_HP_2ms_stat ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_5ms ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_5ms ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_HP_5ms_stat ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_10ms ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_10ms ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_HP_10ms_stat ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_HP_seqcst ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_exp ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_HP_exp ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_HP_stat ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_HP_dyn ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_HP_dyn_stat ) \
+ CDSSTRESS_Stack_F( test_fixture, Elimination_HP_dyn )
#define CDSSTRESS_EliminationStack_DHP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP ) \
#define CDSSTRESS_EliminationStack_DHP( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_seqcst ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_2ms ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_2ms ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_2ms_stat ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_5ms ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_5ms ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_5ms_stat ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_10ms ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_10ms ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_10ms_stat ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_exp ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_exp ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_stat ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_dyn ) \
- CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_dyn_stat )
+ CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_dyn )
#define CDSSTRESS_FCStack_slist( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_slist ) \
#define CDSSTRESS_FCStack_slist( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_slist ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_slist_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_slist_elimination ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_slist_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_slist_elimination_stat ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_stat ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_elimination_stat ) \
+ CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_elimination )
#define CDSSTRESS_FCStack_list( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list ) \
#define CDSSTRESS_FCStack_list( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination_stat ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex_stat ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex_elimination_stat )
+ CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex_elimination )
#define CDSSTRESS_StdStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, StdStack_Deque_Mutex ) \
#define CDSSTRESS_StdStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, StdStack_Deque_Mutex ) \
diff --git
a/test/stress/stack/push.cpp
b/test/stress/stack/push.cpp
index 1ba57d7a156d91fa135eec98d4f92e4c725993fd..5d0b868b11fdda27eabc0177fd0c0d08a4c69ec5 100644
(file)
--- a/
test/stress/stack/push.cpp
+++ b/
test/stress/stack/push.cpp
@@
-204,6
+204,5
@@
namespace {
CDSSTRESS_EliminationStack( stack_push )
CDSSTRESS_FCStack( stack_push )
CDSSTRESS_FCDeque( stack_push )
CDSSTRESS_EliminationStack( stack_push )
CDSSTRESS_FCStack( stack_push )
CDSSTRESS_FCDeque( stack_push )
- CDSSTRESS_StdStack( stack_push )
} // namespace
} // namespace
diff --git
a/test/stress/stack/push_pop.cpp
b/test/stress/stack/push_pop.cpp
index 4ed882d41a9e2139a41fcf995d0508cd9325628d..c335366f2190567726d0e84e0e000c2d1d6329d9 100644
(file)
--- a/
test/stress/stack/push_pop.cpp
+++ b/
test/stress/stack/push_pop.cpp
@@
-281,6
+281,5
@@
namespace {
CDSSTRESS_EliminationStack( stack_push_pop )
CDSSTRESS_FCStack( stack_push_pop )
CDSSTRESS_FCDeque( stack_push_pop )
CDSSTRESS_EliminationStack( stack_push_pop )
CDSSTRESS_FCStack( stack_push_pop )
CDSSTRESS_FCDeque( stack_push_pop )
- CDSSTRESS_StdStack( stack_push_pop )
} // namespace
} // namespace
diff --git
a/test/stress/stack/stack_type.h
b/test/stress/stack/stack_type.h
index a9a7350d05cf12150e758f5aa37fc2522120de27..8ae69cd3111f0156232a35cf2ac66346c59827a8 100644
(file)
--- a/
test/stress/stack/stack_type.h
+++ b/
test/stress/stack/stack_type.h
@@
-492,70
+492,46
@@
namespace cds_test {
#define CDSSTRESS_TreiberStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP ) \
#define CDSSTRESS_TreiberStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_HP_seqcst ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP_exp ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_HP_exp ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_HP_stat ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_pause ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP ) \
CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_pause ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_exp ) \
- CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_stat ) \
+ CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_exp )
#define CDSSTRESS_EliminationStack( test_fixture ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_2ms ) \
#define CDSSTRESS_EliminationStack( test_fixture ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_2ms ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_2ms_stat) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_5ms ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_5ms ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_5ms_stat) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_10ms ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_10ms ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_10ms_stat) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_seqcst ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_pause ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_exp ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_pause ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_exp ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_stat ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_dyn ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_dyn ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_dyn_stat) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_2ms ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_2ms ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_2ms_stat) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_5ms ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_5ms ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_5ms_stat) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_10ms ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_10ms ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_10ms_stat) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_pause ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_exp ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_pause ) \
CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_exp ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_stat ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_dyn ) \
- CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_dyn_stat)
+ CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_dyn )
#define CDSSTRESS_FCStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_deque ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_deque_mutex ) \
#define CDSSTRESS_FCStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_deque ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_deque_mutex ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_deque_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_deque_elimination ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_deque_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_deque_elimination_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_vector ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_vector_mutex ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_vector ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_vector_mutex ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_vector_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_vector_elimination ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_vector_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_vector_elimination_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list ) \
CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_stat ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination_stat )
+ CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination )
#define CDSSTRESS_FCDeque( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeL_default ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeL_mutex ) \
#define CDSSTRESS_FCDeque( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeL_default ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeL_mutex ) \
- CDSSTRESS_Stack_F( test_fixture, FCDequeL_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeL_elimination ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeL_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCDequeL_elimination_stat ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeR_default ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeR_mutex ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeR_default ) \
CDSSTRESS_Stack_F( test_fixture, FCDequeR_mutex ) \
- CDSSTRESS_Stack_F( test_fixture, FCDequeR_stat ) \
- CDSSTRESS_Stack_F( test_fixture, FCDequeR_elimination ) \
- CDSSTRESS_Stack_F( test_fixture, FCDequeR_elimination_stat )
+ CDSSTRESS_Stack_F( test_fixture, FCDequeR_elimination )
#define CDSSTRESS_StdStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, StdStack_Deque_Mutex ) \
#define CDSSTRESS_StdStack( test_fixture ) \
CDSSTRESS_Stack_F( test_fixture, StdStack_Deque_Mutex ) \