From: khizmax Date: Thu, 23 Oct 2014 17:55:16 +0000 (+0400) Subject: index on dev: 5db878e remove michael_list_hrc.h X-Git-Tag: v2.0.0~178^2^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7b0cb08f9f5ec2bccdb40d9ab97441af702e2aaf;p=libcds.git index on dev: 5db878e remove michael_list_hrc.h --- diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_dhp.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_dhp.cpp new file mode 100644 index 00000000..fed0ec88 --- /dev/null +++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael_dhp.cpp @@ -0,0 +1,129 @@ +//$$CDS-header$$ + +#include "ordered_list/hdr_intrusive_michael.h" +#include + +namespace ordlist { + void IntrusiveMichaelListHeaderTest::PTB_base_cmp() + { + typedef base_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::base_hook< co::gc > > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > list; + test_int(); + } + void IntrusiveMichaelListHeaderTest::PTB_base_less() + { + typedef base_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::base_hook< co::gc > > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > list; + test_int(); + } + void IntrusiveMichaelListHeaderTest::PTB_base_cmpmix() + { + typedef base_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::base_hook< co::gc > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > list; + test_int(); + } + void IntrusiveMichaelListHeaderTest::PTB_base_ic() + { + typedef base_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::base_hook< co::gc > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + ,co::item_counter< cds::atomicity::item_counter > + >::type + > list; + test_int(); + } + void IntrusiveMichaelListHeaderTest::PTB_member_cmp() + { + typedef member_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > list; + test_int(); + } + void IntrusiveMichaelListHeaderTest::PTB_member_less() + { + typedef member_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > list; + test_int(); + } + void IntrusiveMichaelListHeaderTest::PTB_member_cmpmix() + { + typedef member_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > list; + test_int(); + } + void IntrusiveMichaelListHeaderTest::PTB_member_ic() + { + typedef member_int_item< cds::gc::PTB > item; + typedef ci::MichaelList< cds::gc::PTB + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + ,co::item_counter< cds::atomicity::item_counter > + >::type + > list; + test_int(); + } + +} // namespace ordlist diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp deleted file mode 100644 index fed0ec88..00000000 --- a/tests/test-hdr/ordered_list/hdr_intrusive_michael_ptb.cpp +++ /dev/null @@ -1,129 +0,0 @@ -//$$CDS-header$$ - -#include "ordered_list/hdr_intrusive_michael.h" -#include - -namespace ordlist { - void IntrusiveMichaelListHeaderTest::PTB_base_cmp() - { - typedef base_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::PTB_base_less() - { - typedef base_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::PTB_base_cmpmix() - { - typedef base_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::PTB_base_ic() - { - typedef base_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::PTB_member_cmp() - { - typedef member_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::member_hook< - offsetof( item, hMember ), - co::gc - > > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::PTB_member_less() - { - typedef member_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::member_hook< - offsetof( item, hMember ), - co::gc - > > - ,co::less< less > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::PTB_member_cmpmix() - { - typedef member_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::member_hook< - offsetof( item, hMember ), - co::gc - > > - ,co::less< less > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - >::type - > list; - test_int(); - } - void IntrusiveMichaelListHeaderTest::PTB_member_ic() - { - typedef member_int_item< cds::gc::PTB > item; - typedef ci::MichaelList< cds::gc::PTB - ,item - ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::member_hook< - offsetof( item, hMember ), - co::gc - > > - ,co::compare< cmp > - ,ci::opt::disposer< faked_disposer > - ,co::item_counter< cds::atomicity::item_counter > - >::type - > list; - test_int(); - } - -} // namespace ordlist diff --git a/tests/test-hdr/ordered_list/hdr_michael_dhp.cpp b/tests/test-hdr/ordered_list/hdr_michael_dhp.cpp new file mode 100644 index 00000000..0dfb8ac0 --- /dev/null +++ b/tests/test-hdr/ordered_list/hdr_michael_dhp.cpp @@ -0,0 +1,100 @@ +//$$CDS-header$$ + +#include "ordered_list/hdr_michael.h" +#include + +namespace ordlist { + namespace { + struct PTB_cmp_traits: public cc::michael_list::type_traits + { + typedef MichaelListTestHeader::cmp compare; + }; + } + void MichaelListTestHeader::PTB_cmp() + { + // traits-based version + typedef cc::MichaelList< cds::gc::PTB, item, PTB_cmp_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelList< cds::gc::PTB, item, + cc::michael_list::make_traits< + cc::opt::compare< cmp > + >::type + > opt_list; + test< opt_list >(); + } + + namespace { + struct PTB_less_traits: public cc::michael_list::type_traits + { + typedef MichaelListTestHeader::lt less; + }; + } + void MichaelListTestHeader::PTB_less() + { + // traits-based version + typedef cc::MichaelList< cds::gc::PTB, item, PTB_less_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelList< cds::gc::PTB, item, + cc::michael_list::make_traits< + cc::opt::less< lt > + >::type + > opt_list; + test< opt_list >(); + } + + namespace { + struct PTB_cmpmix_traits: public cc::michael_list::type_traits + { + typedef MichaelListTestHeader::cmp compare; + typedef MichaelListTestHeader::lt less; + }; + } + void MichaelListTestHeader::PTB_cmpmix() + { + // traits-based version + typedef cc::MichaelList< cds::gc::PTB, item, PTB_cmpmix_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelList< cds::gc::PTB, item, + cc::michael_list::make_traits< + cc::opt::compare< cmp > + ,cc::opt::less< lt > + >::type + > opt_list; + test< opt_list >(); + } + + namespace { + struct PTB_ic_traits: public cc::michael_list::type_traits + { + typedef MichaelListTestHeader::lt less; + typedef cds::atomicity::item_counter item_counter; + }; + } + void MichaelListTestHeader::PTB_ic() + { + // traits-based version + typedef cc::MichaelList< cds::gc::PTB, item, PTB_ic_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelList< cds::gc::PTB, item, + cc::michael_list::make_traits< + cc::opt::less< lt > + ,cc::opt::item_counter< cds::atomicity::item_counter > + >::type + > opt_list; + test< opt_list >(); + } + +} // namespace ordlist + diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv_dhp.cpp b/tests/test-hdr/ordered_list/hdr_michael_kv_dhp.cpp new file mode 100644 index 00000000..b66b3d37 --- /dev/null +++ b/tests/test-hdr/ordered_list/hdr_michael_kv_dhp.cpp @@ -0,0 +1,100 @@ +//$$CDS-header$$ + +#include "ordered_list/hdr_michael_kv.h" +#include + +namespace ordlist { + namespace { + struct PTB_cmp_traits: public cc::michael_list::type_traits + { + typedef MichaelKVListTestHeader::cmp compare; + }; + } + void MichaelKVListTestHeader::PTB_cmp() + { + // traits-based version + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_cmp_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, + cc::michael_list::make_traits< + cc::opt::compare< cmp > + >::type + > opt_list; + test< opt_list >(); + } + + namespace { + struct PTB_less_traits: public cc::michael_list::type_traits + { + typedef MichaelKVListTestHeader::lt less; + }; + } + void MichaelKVListTestHeader::PTB_less() + { + // traits-based version + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_less_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, + cc::michael_list::make_traits< + cc::opt::less< lt > + >::type + > opt_list; + test< opt_list >(); + } + + namespace { + struct PTB_cmpmix_traits: public cc::michael_list::type_traits + { + typedef MichaelKVListTestHeader::cmp compare; + typedef MichaelKVListTestHeader::lt less; + }; + } + void MichaelKVListTestHeader::PTB_cmpmix() + { + // traits-based version + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_cmpmix_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, + cc::michael_list::make_traits< + cc::opt::compare< cmp > + ,cc::opt::less< lt > + >::type + > opt_list; + test< opt_list >(); + } + + namespace { + struct PTB_ic_traits: public cc::michael_list::type_traits + { + typedef MichaelKVListTestHeader::lt less; + typedef cds::atomicity::item_counter item_counter; + }; + } + void MichaelKVListTestHeader::PTB_ic() + { + // traits-based version + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_ic_traits > list; + test< list >(); + + // option-based version + + typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, + cc::michael_list::make_traits< + cc::opt::less< lt > + ,cc::opt::item_counter< cds::atomicity::item_counter > + >::type + > opt_list; + test< opt_list >(); + } + +} // namespace ordlist + diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp b/tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp deleted file mode 100644 index b66b3d37..00000000 --- a/tests/test-hdr/ordered_list/hdr_michael_kv_ptb.cpp +++ /dev/null @@ -1,100 +0,0 @@ -//$$CDS-header$$ - -#include "ordered_list/hdr_michael_kv.h" -#include - -namespace ordlist { - namespace { - struct PTB_cmp_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::cmp compare; - }; - } - void MichaelKVListTestHeader::PTB_cmp() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_cmp_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct PTB_less_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::lt less; - }; - } - void MichaelKVListTestHeader::PTB_less() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_less_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct PTB_cmpmix_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::cmp compare; - typedef MichaelKVListTestHeader::lt less; - }; - } - void MichaelKVListTestHeader::PTB_cmpmix() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_cmpmix_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - ,cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct PTB_ic_traits: public cc::michael_list::type_traits - { - typedef MichaelKVListTestHeader::lt less; - typedef cds::atomicity::item_counter item_counter; - }; - } - void MichaelKVListTestHeader::PTB_ic() - { - // traits-based version - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, PTB_ic_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelKVList< cds::gc::PTB, key_type, value_type, - cc::michael_list::make_traits< - cc::opt::less< lt > - ,cc::opt::item_counter< cds::atomicity::item_counter > - >::type - > opt_list; - test< opt_list >(); - } - -} // namespace ordlist - diff --git a/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp b/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp deleted file mode 100644 index 0dfb8ac0..00000000 --- a/tests/test-hdr/ordered_list/hdr_michael_ptb.cpp +++ /dev/null @@ -1,100 +0,0 @@ -//$$CDS-header$$ - -#include "ordered_list/hdr_michael.h" -#include - -namespace ordlist { - namespace { - struct PTB_cmp_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::cmp compare; - }; - } - void MichaelListTestHeader::PTB_cmp() - { - // traits-based version - typedef cc::MichaelList< cds::gc::PTB, item, PTB_cmp_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::PTB, item, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct PTB_less_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::lt less; - }; - } - void MichaelListTestHeader::PTB_less() - { - // traits-based version - typedef cc::MichaelList< cds::gc::PTB, item, PTB_less_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::PTB, item, - cc::michael_list::make_traits< - cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct PTB_cmpmix_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::cmp compare; - typedef MichaelListTestHeader::lt less; - }; - } - void MichaelListTestHeader::PTB_cmpmix() - { - // traits-based version - typedef cc::MichaelList< cds::gc::PTB, item, PTB_cmpmix_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::PTB, item, - cc::michael_list::make_traits< - cc::opt::compare< cmp > - ,cc::opt::less< lt > - >::type - > opt_list; - test< opt_list >(); - } - - namespace { - struct PTB_ic_traits: public cc::michael_list::type_traits - { - typedef MichaelListTestHeader::lt less; - typedef cds::atomicity::item_counter item_counter; - }; - } - void MichaelListTestHeader::PTB_ic() - { - // traits-based version - typedef cc::MichaelList< cds::gc::PTB, item, PTB_ic_traits > list; - test< list >(); - - // option-based version - - typedef cc::MichaelList< cds::gc::PTB, item, - cc::michael_list::make_traits< - cc::opt::less< lt > - ,cc::opt::item_counter< cds::atomicity::item_counter > - >::type - > opt_list; - test< opt_list >(); - } - -} // namespace ordlist -