X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Funit%2Fintrusive-set%2Ftest_intrusive_skiplist_rcu.h;h=cbfdfba4bb13de8a0b13ed50ef30e05a17353bec;hb=1132246d5685f87a5b240e077b7e88d56e38b1ff;hp=ddaa8dd10446fba9b32b2c6d5edd092226386c6e;hpb=006e374d9d4cb806741c6a25505466c02f8ccc11;p=libcds.git diff --git a/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h b/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h index ddaa8dd1..cbfdfba4 100644 --- a/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h +++ b/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h @@ -1,11 +1,11 @@ /* 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: @@ -25,7 +25,7 @@ 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. */ #ifndef CDSUNIT_SET_TEST_INTRUSIVE_SKIPLIST_RCU_H #define CDSUNIT_SET_TEST_INTRUSIVE_SKIPLIST_RCU_H @@ -65,13 +65,13 @@ TYPED_TEST_P( IntrusiveSkipListSet, base_cmp ) typedef typename TestFixture::rcu_type rcu_type; typedef typename TestFixture::base_item_type base_item_type; typedef typename TestFixture::mock_disposer mock_disposer; - typedef typename TestFixture::template cmp cmp; + typedef typename TestFixture::template cmp item_cmp; struct traits : public ci::skip_list::traits { typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; typedef mock_disposer disposer; - typedef cmp compare; + typedef item_cmp compare; }; typedef ci::SkipListSet< rcu_type, base_item_type, traits > set_type; @@ -106,14 +106,14 @@ TYPED_TEST_P( IntrusiveSkipListSet, base_cmpmix ) typedef typename TestFixture::rcu_type rcu_type; typedef typename TestFixture::base_item_type base_item_type; typedef typename TestFixture::mock_disposer mock_disposer; - typedef typename TestFixture::template cmp cmp; + typedef typename TestFixture::template cmp item_cmp; typedef typename TestFixture::template less less_predicate; struct traits : public ci::skip_list::traits { typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; typedef mock_disposer disposer; - typedef cmp compare; + typedef item_cmp compare; typedef less_predicate less; typedef ci::skip_list::stat<> stat; }; @@ -124,19 +124,124 @@ TYPED_TEST_P( IntrusiveSkipListSet, base_cmpmix ) this->test( s ); } -TYPED_TEST_P( IntrusiveSkipListSet, base_xorshift ) +TYPED_TEST_P( IntrusiveSkipListSet, base_xorshift32 ) { typedef typename TestFixture::rcu_type rcu_type; typedef typename TestFixture::base_item_type base_item_type; typedef typename TestFixture::mock_disposer mock_disposer; - typedef typename TestFixture::template cmp cmp; + typedef typename TestFixture::template cmp item_cmp; struct traits : public ci::skip_list::traits { typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; typedef mock_disposer disposer; - typedef cmp compare; - typedef ci::skip_list::xorshift random_level_generator; + typedef item_cmp compare; + typedef ci::skip_list::xorshift32 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, base_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, base_xorshift24 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef ci::skip_list::xorshift24 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, base_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, base_xorshift16 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef ci::skip_list::xorshift16 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, base_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, base_turbo32 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef ci::skip_list::turbo32 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, base_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, base_turbo24 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef ci::skip_list::turbo24 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, base_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, base_turbo16 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef ci::skip_list::turbo16 random_level_generator; }; typedef ci::SkipListSet< rcu_type, base_item_type, traits > set_type; @@ -151,13 +256,13 @@ TYPED_TEST_P( IntrusiveSkipListSet, member_cmp ) typedef typename TestFixture::rcu_type rcu_type; typedef typename TestFixture::member_item_type member_item_type; typedef typename TestFixture::mock_disposer mock_disposer; - typedef typename TestFixture::template cmp cmp; + typedef typename TestFixture::template cmp item_cmp; struct traits : public ci::skip_list::traits { typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; typedef mock_disposer disposer; - typedef cmp compare; + typedef item_cmp compare; }; typedef ci::SkipListSet< rcu_type, member_item_type, traits > set_type; @@ -172,7 +277,7 @@ TYPED_TEST_P( IntrusiveSkipListSet, member_less ) typedef typename TestFixture::member_item_type member_item_type; typedef typename TestFixture::mock_disposer mock_disposer; typedef typename TestFixture::template less less_predicate; - typedef typename TestFixture::hash_int hash_int; + //typedef typename TestFixture::hash_int hash_int; struct traits : public ci::skip_list::traits { @@ -195,13 +300,13 @@ TYPED_TEST_P( IntrusiveSkipListSet, member_cmpmix ) typedef typename TestFixture::member_item_type member_item_type; typedef typename TestFixture::mock_disposer mock_disposer; typedef typename TestFixture::template less less_predicate; - typedef typename TestFixture::template cmp cmp; + typedef typename TestFixture::template cmp item_cmp; struct traits : public ci::skip_list::traits { typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; typedef mock_disposer disposer; - typedef cmp compare; + typedef item_cmp compare; typedef less_predicate less; typedef ci::skip_list::stat<> stat; }; @@ -212,22 +317,22 @@ TYPED_TEST_P( IntrusiveSkipListSet, member_cmpmix ) this->test( s ); } -TYPED_TEST_P( IntrusiveSkipListSet, member_xorshift ) +TYPED_TEST_P( IntrusiveSkipListSet, member_xorshift32 ) { typedef typename TestFixture::rcu_type rcu_type; typedef typename TestFixture::member_item_type member_item_type; typedef typename TestFixture::mock_disposer mock_disposer; typedef typename TestFixture::template less less_predicate; - typedef typename TestFixture::template cmp cmp; + typedef typename TestFixture::template cmp item_cmp; struct traits : public ci::skip_list::traits { typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; typedef mock_disposer disposer; - typedef cmp compare; + typedef item_cmp compare; typedef less_predicate less; typedef ci::skip_list::stat<> stat; - typedef ci::skip_list::xorshift random_level_generator; + typedef ci::skip_list::xorshift32 random_level_generator; }; typedef ci::SkipListSet< rcu_type, member_item_type, traits > set_type; @@ -236,13 +341,133 @@ TYPED_TEST_P( IntrusiveSkipListSet, member_xorshift ) this->test( s ); } +TYPED_TEST_P( IntrusiveSkipListSet, member_xorshift24 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::member_item_type member_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template less less_predicate; + typedef typename TestFixture::template cmp item_cmp; -// GCC 5: All test names should be written on single line, otherwise a runtime error will be encountered like as + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef less_predicate less; + typedef ci::skip_list::stat<> stat; + typedef ci::skip_list::xorshift24 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, member_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, member_xorshift16 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::member_item_type member_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template less less_predicate; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef less_predicate less; + typedef ci::skip_list::stat<> stat; + typedef ci::skip_list::xorshift16 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, member_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, member_turbo32 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::member_item_type member_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template less less_predicate; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef less_predicate less; + typedef ci::skip_list::stat<> stat; + typedef ci::skip_list::turbo32 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, member_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, member_turbo24 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::member_item_type member_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template less less_predicate; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef less_predicate less; + typedef ci::skip_list::stat<> stat; + typedef ci::skip_list::turbo24 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, member_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSkipListSet, member_turbo16 ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::member_item_type member_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::template less less_predicate; + typedef typename TestFixture::template cmp item_cmp; + + struct traits: public ci::skip_list::traits + { + typedef ci::skip_list::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >> hook; + typedef mock_disposer disposer; + typedef item_cmp compare; + typedef less_predicate less; + typedef ci::skip_list::stat<> stat; + typedef ci::skip_list::turbo16 random_level_generator; + }; + + typedef ci::SkipListSet< rcu_type, member_item_type, traits > set_type; + + set_type s; + this->test( s ); +} + + +// All test names should be written on single line, otherwise a runtime error will be encountered like as // "No test named can be found in this test case" REGISTER_TYPED_TEST_CASE_P( IntrusiveSkipListSet, - base_cmp, base_less, base_cmpmix, base_xorshift, member_cmp, member_less, member_cmpmix, member_xorshift + base_cmp, base_less, base_cmpmix, base_xorshift32, base_xorshift24, base_xorshift16, base_turbo32, base_turbo24, base_turbo16, member_cmp, member_less, member_cmpmix, member_xorshift32, member_xorshift24, member_xorshift16, member_turbo32, member_turbo24, member_turbo16 ); #endif // CDSUNIT_SET_TEST_INTRUSIVE_SKIPLIST_RCU_H - \ No newline at end of file +