From b051db59aef9eac7d89a30667f72176da351f95a Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 26 Oct 2014 09:52:41 +0300 Subject: [PATCH] intrusive::MichaelSet refactoring --- cds/intrusive/details/michael_set_base.h | 35 ++- cds/intrusive/michael_set.h | 226 ++++++++---------- cds/intrusive/michael_set_nogc.h | 141 ++++------- cds/intrusive/michael_set_rcu.h | 192 ++++++--------- projects/Win/vc12/hdr-test-set.vcxproj | 4 +- .../Win/vc12/hdr-test-set.vcxproj.filters | 12 +- projects/source.test-hdr.mk | 14 +- projects/source.test-hdr.offsetof.mk | 10 +- ....cpp => hdr_intrusive_michael_set_dhp.cpp} | 62 ++--- ...=> hdr_intrusive_michael_set_dhp_lazy.cpp} | 60 ++--- .../set/hdr_intrusive_michael_set_hp_lazy.cpp | 8 +- .../set/hdr_intrusive_michael_set_rcu_gpi.cpp | 20 +- ...hdr_intrusive_michael_set_rcu_gpi_lazy.cpp | 19 +- tests/test-hdr/set/hdr_intrusive_set.h | 48 ++-- 14 files changed, 362 insertions(+), 489 deletions(-) rename tests/test-hdr/set/{hdr_intrusive_michael_set_ptb.cpp => hdr_intrusive_michael_set_dhp.cpp} (69%) rename tests/test-hdr/set/{hdr_intrusive_michael_set_ptb_lazy.cpp => hdr_intrusive_michael_set_dhp_lazy.cpp} (66%) diff --git a/cds/intrusive/details/michael_set_base.h b/cds/intrusive/details/michael_set_base.h index 2fb5a06b..09be328c 100644 --- a/cds/intrusive/details/michael_set_base.h +++ b/cds/intrusive/details/michael_set_base.h @@ -3,7 +3,6 @@ #ifndef __CDS_INTRUSIVE_DETAILS_MICHAEL_SET_BASE_H #define __CDS_INTRUSIVE_DETAILS_MICHAEL_SET_BASE_H -#include // ref #include #include #include @@ -17,8 +16,8 @@ namespace cds { namespace intrusive { */ namespace michael_set { - /// Type traits for MichaelHashSet class - struct type_traits { + /// MichaelHashSet traits + struct traits { /// Hash function /** Hash function converts the key fields of struct \p T stored in the hash-set @@ -26,42 +25,38 @@ namespace cds { namespace intrusive { This is mandatory type and has no predefined one. */ - typedef opt::none hash; + typedef opt::none hash; /// Item counter /** - The item counting is an important part of MichaelHashSet algorithm: - the empty() member function depends on correct item counting. - Therefore, atomicity::empty_item_counter is not allowed as a type of the option. + The item counting is an important part of \p MichaelHashSet algorithm: + the \p empty() member function depends on correct item counting. + Therefore, \p atomicity::empty_item_counter is not allowed as a type of the option. - Default is atomicity::item_counter. + Default is \p atomicity::item_counter. */ - typedef atomicity::item_counter item_counter; + typedef cds::atomicity::item_counter item_counter; /// Bucket table allocator /** Allocator for bucket table. Default is \ref CDS_DEFAULT_ALLOCATOR - The allocator uses only in ctor (for allocating bucket table) - and in dtor (for destroying bucket table) + The allocator uses only in constructor for allocating bucket table + and in destructor for destroying bucket table */ typedef CDS_DEFAULT_ALLOCATOR allocator; }; /// Metafunction converting option list to traits struct /** - This is a wrapper for cds::opt::make_options< type_traits, Options...> - Available \p Options: - - opt::hash - mandatory option, specifies hash functor. - - opt::item_counter - optional, specifies item counting policy. See type_traits::item_counter + - \p opt::hash - mandatory option, specifies hash functor. + - \p opt::item_counter - optional, specifies item counting policy. See \p traits::item_counter for default type. - - opt::allocator - optional, bucket table allocator. Default is \ref CDS_DEFAULT_ALLOCATOR. - - See \ref MichaelHashSet, \ref type_traits. + - \p opt::allocator - optional, bucket table allocator. Default is \ref CDS_DEFAULT_ALLOCATOR. */ template struct make_traits { - typedef typename cds::opt::make_options< type_traits, Options...>::type type ; ///< Result of metafunction + typedef typename cds::opt::make_options< traits, Options...>::type type; ///< Metafunction result }; //@cond @@ -198,7 +193,7 @@ namespace cds { namespace intrusive { //@cond // Forward declarations - template + template class MichaelHashSet; //@endcond diff --git a/cds/intrusive/michael_set.h b/cds/intrusive/michael_set.h index d8d92292..17844277 100644 --- a/cds/intrusive/michael_set.h +++ b/cds/intrusive/michael_set.h @@ -22,28 +22,28 @@ namespace cds { namespace intrusive { Template parameters are: - \p GC - Garbage collector used. Note the \p GC must be the same as the GC used for \p OrderedList - - \p OrderedList - ordered list implementation used as bucket for hash set, for example, MichaelList, LazyList. + - \p OrderedList - ordered list implementation used as bucket for hash set, for example, \p MichaelList, \p LazyList. The intrusive ordered list implementation specifies the type \p T stored in the hash-set, the reclamation schema \p GC used by hash-set, the comparison functor for the type \p T and other features specific for the ordered list. - - \p Traits - type traits. See michael_set::type_traits for explanation. - Instead of defining \p Traits struct you can use option-based syntax with michael_set::make_traits metafunction. + - \p Traits - type traits. See \p michael_set::traits for explanation. + Instead of defining \p Traits struct you can use option-based syntax with \p michael_set::make_traits metafunction. There are several specializations of \p %MichaelHashSet for each GC. You should include: - for \ref cds_intrusive_MichaelHashSet_rcu "RCU type" - - for \ref cds_intrusive_MichaelHashSet_nogc for persistent set - - for other GC (gc::HP, gc::PTB) + - for \ref cds_intrusive_MichaelHashSet_nogc for append-only set + - for \p gc::HP, \p gc::DHP Hash functor Some member functions of Michael's hash set accept the key parameter of type \p Q which differs from \p value_type. It is expected that type \p Q contains full key of \p value_type, and for equal keys of type \p Q and \p value_type - the hash values of these keys must be equal too. - The hash functor Traits::hash should accept parameters of both type: + the hash values of these keys must be equal. + The hash functor \p Traits::hash should accept parameters of both type: \code // Our node type struct Foo { - std::string key_ ; // key field + std::string key_; // key field // ... other fields }; @@ -61,7 +61,6 @@ namespace cds { namespace intrusive { }; \endcode - How to use First, you should define ordered list type to use in your hash set: @@ -139,10 +138,11 @@ namespace cds { namespace intrusive { struct tag_key2_idx; // Your two-key data - // The first key is maintained by gc::HP, second key is maintained by gc::PTB garbage collectors + // The first key is maintained by gc::HP, second key is maintained by gc::DHP garbage collectors + // (I don't know what is needed for, but it is correct) struct Foo : public cds::intrusive::michael_list::node< cds::gc::HP, tag_key1_idx > - , public cds::intrusive::michael_list::node< cds::gc::PTB, tag_key2_idx > + , public cds::intrusive::michael_list::node< cds::gc::DHP, tag_key2_idx > { std::string key1_ ; // first key field unsigned int key2_ ; // second key field @@ -170,11 +170,11 @@ namespace cds { namespace intrusive { >::type > Key1_bucket; - // Declare bucket type for Michael's hash set indexed by key2_ field and maintained by gc::PTB - typedef cds::intrusive::MichaelList< cds::gc::PTB, Foo, + // Declare bucket type for Michael's hash set indexed by key2_ field and maintained by gc::DHP + typedef cds::intrusive::MichaelList< cds::gc::DHP, Foo, typename cds::intrusive::michael_list::make_traits< // hook option - cds::intrusive::opt::hook< cds::intrusive::michael_list::base_hook< cds::opt::gc< cds::gc::PTB >, tag_key2_idx > > + cds::intrusive::opt::hook< cds::intrusive::michael_list::base_hook< cds::opt::gc< cds::gc::DHP >, tag_key2_idx > > // item comparator option ,cds::opt::less< Key2Less > >::type @@ -198,7 +198,7 @@ namespace cds { namespace intrusive { // Michael's set indexed by key2_ field typedef cds::intrusive::MichaelHashSet< - cds::gc::PTB + cds::gc::DHP ,Key2_bucket ,typename cds::intrusive::michael_set::make_traits< cds::opt::hash< Key2Hash > @@ -210,7 +210,7 @@ namespace cds { namespace intrusive { class GC, class OrderedList, #ifdef CDS_DOXYGEN_INVOKED - class Traits = michael_set::type_traits + class Traits = michael_set::traits #else class Traits #endif @@ -218,29 +218,28 @@ namespace cds { namespace intrusive { class MichaelHashSet { public: - typedef OrderedList ordered_list ; ///< type of ordered list used as a bucket implementation - typedef ordered_list bucket_type ; ///< bucket type - typedef Traits options ; ///< Traits template parameters + typedef GC gc; ///< Garbage collector + typedef OrderedList ordered_list; ///< type of ordered list used as a bucket implementation + typedef ordered_list bucket_type; ///< bucket type + typedef Traits traits; ///< Set traits - typedef typename ordered_list::value_type value_type ; ///< type of value stored in the list - typedef GC gc ; ///< Garbage collector - typedef typename ordered_list::key_comparator key_comparator ; ///< key comparison functor + typedef typename ordered_list::value_type value_type ; ///< type of value to be stored in the set + typedef typename ordered_list::key_comparator key_comparator ; ///< key comparing functor typedef typename ordered_list::disposer disposer ; ///< Node disposer functor - /// Hash functor for \ref value_type and all its derivatives that you use - typedef typename cds::opt::v::hash_selector< typename options::hash >::type hash; - typedef typename options::item_counter item_counter ; ///< Item counter type + /// Hash functor for \p value_type and all its derivatives that you use + typedef typename cds::opt::v::hash_selector< typename traits::hash >::type hash; + typedef typename traits::item_counter item_counter; ///< Item counter type - typedef typename ordered_list::guarded_ptr guarded_ptr; ///< Guarded pointer + typedef typename ordered_list::guarded_ptr guarded_ptr; ///< Guarded pointer /// Bucket table allocator - typedef cds::details::Allocator< bucket_type, typename options::allocator > bucket_table_allocator; + typedef cds::details::Allocator< bucket_type, typename traits::allocator > bucket_table_allocator; protected: - item_counter m_ItemCounter ; ///< Item counter - hash m_HashFunctor ; ///< Hash functor - - bucket_type * m_Buckets ; ///< bucket table + item_counter m_ItemCounter; ///< Item counter + hash m_HashFunctor; ///< Hash functor + bucket_type * m_Buckets; ///< bucket table private: //@cond @@ -248,6 +247,7 @@ namespace cds { namespace intrusive { //@endcond protected: + //@cond /// Calculates hash value of \p key template size_t hash_value( const Q& key ) const @@ -261,6 +261,7 @@ namespace cds { namespace intrusive { { return m_Buckets[ hash_value( key ) ]; } + //@endcond public: /// Forward iterator @@ -328,7 +329,7 @@ namespace cds { namespace intrusive { //@} private: - //@{ + //@cond const_iterator get_const_begin() const { return const_iterator( m_Buckets[0].begin(), m_Buckets, m_Buckets + bucket_count() ); @@ -337,11 +338,11 @@ namespace cds { namespace intrusive { { return const_iterator( m_Buckets[bucket_count() - 1].end(), m_Buckets + bucket_count() - 1, m_Buckets + bucket_count() ); } - //@} + //@endcond public: /// Initializes hash set - /** + /** @anchor cds_intrusive_MichaelHashSet_hp_ctor The Michael's hash set is an unbounded container, but its hash table is non-expandable. At construction time you should pass estimated maximum item count and a load factor. The load factor is average size of one bucket - a small number between 1 and 10. @@ -350,14 +351,15 @@ namespace cds { namespace intrusive { */ MichaelHashSet( size_t nMaxItemCount, ///< estimation of max item count in the hash set - size_t nLoadFactor ///< load factor: estimation of max number of items in the bucket. Small integer up to 10, default is 1. + size_t nLoadFactor ///< load factor: estimation of max number of items in the bucket. Small integer up to 10. ) : m_nHashBitmask( michael_set::details::init_hash_bitmask( nMaxItemCount, nLoadFactor )) { // GC and OrderedList::gc must be the same - static_assert(( std::is_same::value ), "GC and OrderedList::gc must be the same"); + static_assert( std::is_same::value, "GC and OrderedList::gc must be the same"); // atomicity::empty_item_counter is not allowed as a item counter - static_assert(( !std::is_same::value ), "atomicity::empty_item_counter is not allowed as a item counter"); + static_assert( !std::is_same::value, + "cds::atomicity::empty_item_counter is not allowed as a item counter"); m_Buckets = bucket_table_allocator().NewArray( bucket_count() ); } @@ -397,10 +399,13 @@ namespace cds { namespace intrusive { \code void func( value_type& val ); \endcode - where \p val is the item inserted. User-defined functor \p f should guarantee that during changing - \p val no any other changes could be made on this set's item by concurrent threads. - The user-defined functor is called only if the inserting is success and can be passed by reference - using \p std::ref. + where \p val is the item inserted. + + The user-defined functor is called only if the inserting is success. + + @warning For \ref cds_intrusive_MichaelList_hp "MichaelList": as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting". + \ref cds_intrusive_LazyList_hp "LazyList" provides exclusive access to inserted item and does not require any node-level + synchronization. */ template bool insert( value_type& val, Func f ) @@ -428,14 +433,15 @@ namespace cds { namespace intrusive { If new item has been inserted (i.e. \p bNew is \p true) then \p item and \p val arguments refers to the same thing. - The functor may change non-key fields of the \p item; however, \p func must guarantee - that during changing no any other modifications could be made on this item by concurrent threads. - - You may pass \p func argument by reference using \p std::ref. + The functor may change non-key fields of the \p item. Returns std::pair where \p first is \p true if operation is successfull, \p second is \p true if new item has been added or \p false if the item with \p key already is in the set. + + @warning For \ref cds_intrusive_MichaelList_hp "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting". + \ref cds_intrusive_LazyList_hp "LazyList" provides exclusive access to inserted item and does not require any node-level + synchronization. */ template std::pair ensure( value_type& val, Func func ) @@ -448,7 +454,7 @@ namespace cds { namespace intrusive { /// Unlinks the item \p val from the set /** - The function searches the item \p val in the set and unlink it from the set + The function searches the item \p val in the set and unlink it if it is found and is equal to \p val. The function returns \p true if success and \p false otherwise. @@ -463,16 +469,16 @@ namespace cds { namespace intrusive { /// Deletes the item from the set /** \anchor cds_intrusive_MichaelHashSet_hp_erase - The function searches an item with key equal to \p val in the set, - unlinks it from the set, and returns \p true. - If the item with key equal to \p val is not found the function return \p false. + The function searches an item with key equal to \p key in the set, + unlinks it, and returns \p true. + If the item with key equal to \p key is not found the function return \p false. Note the hash functor should accept a parameter of type \p Q that can be not the same as \p value_type. */ template - bool erase( Q const& val ) + bool erase( Q const& key ) { - if ( bucket( val ).erase( val )) { + if ( bucket( key ).erase( key )) { --m_ItemCounter; return true; } @@ -487,9 +493,9 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool erase_with( Q const& val, Less pred ) + bool erase_with( Q const& key, Less pred ) { - if ( bucket( val ).erase_with( val, pred )) { + if ( bucket( key ).erase_with( key, pred )) { --m_ItemCounter; return true; } @@ -498,7 +504,7 @@ namespace cds { namespace intrusive { /// Deletes the item from the set /** \anchor cds_intrusive_MichaelHashSet_hp_erase_func - The function searches an item with key equal to \p val in the set, + The function searches an item with key equal to \p key in the set, call \p f functor with item found, and unlinks it from the set. The \ref disposer specified in \p OrderedList class template parameter is called by garbage collector \p GC asynchronously. @@ -511,14 +517,14 @@ namespace cds { namespace intrusive { \endcode The functor may be passed by reference with boost:ref - If the item with key equal to \p val is not found the function return \p false. + If the item with key equal to \p key is not found the function return \p false. Note the hash functor should accept a parameter of type \p Q that can be not the same as \p value_type. */ template - bool erase( const Q& val, Func f ) + bool erase( const Q& key, Func f ) { - if ( bucket( val ).erase( val, f )) { + if ( bucket( key ).erase( key, f )) { --m_ItemCounter; return true; } @@ -533,9 +539,9 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool erase_with( const Q& val, Less pred, Func f ) + bool erase_with( const Q& key, Less pred, Func f ) { - if ( bucket( val ).erase_with( val, pred, f )) { + if ( bucket( key ).erase_with( key, pred, f )) { --m_ItemCounter; return true; } @@ -598,16 +604,16 @@ namespace cds { namespace intrusive { return false; } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_MichaelHashSet_hp_find_func - The function searches the item with key equal to \p val and calls the functor \p f for item found. + The function searches the item with key equal to \p key and calls the functor \p f for item found. The interface of \p Func functor is: \code struct functor { - void operator()( value_type& item, Q& val ); + void operator()( value_type& item, Q& key ); }; \endcode - where \p item is the item found, \p val is the find function argument. + where \p item is the item found, \p key is the find function argument. You can pass \p f argument by reference using \p std::ref. @@ -616,21 +622,21 @@ namespace cds { namespace intrusive { The functor does not serialize simultaneous access to the set \p item. If such access is possible you must provide your own synchronization schema on item level to exclude unsafe item modifications. - The \p val argument is non-const since it can be used as \p f functor destination i.e., the functor + The \p key argument is non-const since it can be used as \p f functor destination i.e., the functor may modify both arguments. Note the hash functor specified for class \p Traits template parameter should accept a parameter of type \p Q that can be not the same as \p value_type. - The function returns \p true if \p val is found, \p false otherwise. + The function returns \p true if \p key is found, \p false otherwise. */ template - bool find( Q& val, Func f ) + bool find( Q& key, Func f ) { - return bucket( val ).find( val, f ); + return bucket( key ).find( key, f ); } - /// Finds the key \p val using \p pred predicate for searching + /// Finds the key \p key using \p pred predicate for searching /** The function is an analog of \ref cds_intrusive_MichaelHashSet_hp_find_func "find(Q&, Func)" but \p pred is used for key comparing. @@ -638,68 +644,26 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool find_with( Q& val, Less pred, Func f ) - { - return bucket( val ).find_with( val, pred, f ); - } - - /// Finds the key \p val - /** \anchor cds_intrusive_MichaelHashSet_hp_find_cfunc - The function searches the item with key equal to \p val and calls the functor \p f for item found. - The interface of \p Func functor is: - \code - struct functor { - void operator()( value_type& item, Q& val ); - }; - \endcode - where \p item is the item found, \p val is the find function argument. - - You can pass \p f argument by reference using \p std::ref. - - The functor may change non-key fields of \p item. Note that the functor is only guarantee - that \p item cannot be disposed during functor is executing. - The functor does not serialize simultaneous access to the set \p item. If such access is - possible you must provide your own synchronization schema on item level to exclude unsafe item modifications. - - Note the hash functor specified for class \p Traits template parameter - should accept a parameter of type \p Q that can be not the same as \p value_type. - - The function returns \p true if \p val is found, \p false otherwise. - */ - template - bool find( Q const& val, Func f ) - { - return bucket( val ).find( val, f ); - } - - /// Finds the key \p val using \p pred predicate for searching - /** - The function is an analog of \ref cds_intrusive_MichaelHashSet_hp_find_cfunc "find(Q const&, Func)" - but \p pred is used for key comparing. - \p Less functor has the interface like \p std::less. - \p pred must imply the same element order as the comparator used for building the set. - */ - template - bool find_with( Q const& val, Less pred, Func f ) + bool find_with( Q& key, Less pred, Func f ) { - return bucket( val ).find_with( val, pred, f ); + return bucket( key ).find_with( key, pred, f ); } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_MichaelHashSet_hp_find_val - The function searches the item with key equal to \p val + The function searches the item with key equal to \p key and returns \p true if it is found, and \p false otherwise. Note the hash functor specified for class \p Traits template parameter should accept a parameter of type \p Q that can be not the same as \p value_type. */ template - bool find( Q const & val ) + bool find( Q const& key ) { - return bucket( val ).find( val ); + return bucket( key ).find( key ); } - /// Finds the key \p val using \p pred predicate for searching + /// Finds the key \p key using \p pred predicate for searching /** The function is an analog of \ref cds_intrusive_MichaelHashSet_hp_find_val "find(Q const&)" but \p pred is used for key comparing. @@ -707,17 +671,17 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool find_with( Q const & val, Less pred ) + bool find_with( Q const& key, Less pred ) { - return bucket( val ).find_with( val, pred ); + return bucket( key ).find_with( key, pred ); } - /// Finds the key \p val and return the item found + /// Finds the key \p key and return the item found /** \anchor cds_intrusive_MichaelHashSet_hp_get - The function searches the item with key equal to \p val + The function searches the item with key equal to \p key and assigns the item found to guarded pointer \p ptr. - The function returns \p true if \p val is found, and \p false otherwise. - If \p val is not found the \p ptr parameter is not changed. + The function returns \p true if \p key is found, and \p false otherwise. + If \p key is not found the \p ptr parameter is not changed. @note Each \p guarded_ptr object uses one GC's guard which can be limited resource. @@ -740,12 +704,12 @@ namespace cds { namespace intrusive { should accept a parameter of type \p Q that can be not the same as \p value_type. */ template - bool get( guarded_ptr& ptr, Q const& val ) + bool get( guarded_ptr& ptr, Q const& key ) { - return bucket( val ).get( ptr, val ); + return bucket( key ).get( ptr, key ); } - /// Finds the key \p val and return the item found + /// Finds the key \p key and return the item found /** The function is an analog of \ref cds_intrusive_MichaelHashSet_hp_get "get( guarded_ptr& ptr, Q const&)" but \p pred is used for comparing the keys. @@ -755,9 +719,9 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool get_with( guarded_ptr& ptr, Q const& val, Less pred ) + bool get_with( guarded_ptr& ptr, Q const& key, Less pred ) { - return bucket( val ).get_with( ptr, val, pred ); + return bucket( key ).get_with( ptr, key, pred ); } /// Clears the set (non-atomic) @@ -796,9 +760,9 @@ namespace cds { namespace intrusive { /// Returns the size of hash table /** - Since MichaelHashSet cannot dynamically extend the hash table size, - the value returned is an constant depending on object initialization parameters; - see MichaelHashSet::MichaelHashSet for explanation. + Since \p %MichaelHashSet cannot dynamically extend the hash table size, + the value returned is an constant depending on object initialization parameters, + see \p MichaelHashSet::MichaelHashSet. */ size_t bucket_count() const { diff --git a/cds/intrusive/michael_set_nogc.h b/cds/intrusive/michael_set_nogc.h index 52120faf..983d10c2 100644 --- a/cds/intrusive/michael_set_nogc.h +++ b/cds/intrusive/michael_set_nogc.h @@ -13,46 +13,43 @@ namespace cds { namespace intrusive { /** @ingroup cds_intrusive_map \anchor cds_intrusive_MichaelHashSet_nogc - This specialization is intended for so-called persistent usage when no item - reclamation may be performed. The class does not support deleting of list item. + This specialization is so-called append-only when no item + reclamation may be performed. The set does not support deleting of list item. See \ref cds_intrusive_MichaelHashSet_hp "MichaelHashSet" for description of template parameters. - The template parameter \p OrderedList should be any gc::nogc-derived ordered list, for example, - \ref cds_intrusive_MichaelList_nogc "persistent MichaelList". - - The interface of the specialization is a slightly different. + The template parameter \p OrderedList should be any \p cds::gc::nogc -derived ordered list, for example, + \ref cds_intrusive_MichaelList_nogc "append-only MichaelList". */ template < class OrderedList, #ifdef CDS_DOXYGEN_INVOKED - class Traits = michael_set::type_traits + class Traits = michael_set::traits #else class Traits #endif > - class MichaelHashSet< gc::nogc, OrderedList, Traits > + class MichaelHashSet< cds::gc::nogc, OrderedList, Traits > { public: - typedef OrderedList bucket_type ; ///< type of ordered list used as a bucket implementation - typedef Traits options ; ///< Traits template parameters + typedef cds::gc::nogc gc; ///< Garbage collector + typedef OrderedList bucket_type; ///< Type of ordered list to be used as buckets + typedef Traits traits; ///< Set traits - typedef typename bucket_type::value_type value_type ; ///< type of value stored in the list - typedef gc::nogc gc ; ///< Garbage collector - typedef typename bucket_type::key_comparator key_comparator ; ///< key comparison functor - typedef typename bucket_type::disposer disposer ; ///< Node disposer functor + typedef typename bucket_type::value_type value_type; ///< type of value to be stored in the set + typedef typename bucket_type::key_comparator key_comparator; ///< key comparing functor + typedef typename bucket_type::disposer disposer; ///< Node disposer functor - /// Hash functor for \ref value_type and all its derivatives that you use - typedef typename cds::opt::v::hash_selector< typename options::hash >::type hash; - typedef typename options::item_counter item_counter ; ///< Item counter type + /// Hash functor for \p value_type and all its derivatives that you use + typedef typename cds::opt::v::hash_selector< typename traits::hash >::type hash; + typedef typename traits::item_counter item_counter; ///< Item counter type /// Bucket table allocator - typedef cds::details::Allocator< bucket_type, typename options::allocator > bucket_table_allocator; + typedef cds::details::Allocator< bucket_type, typename traits::allocator > bucket_table_allocator; protected: - item_counter m_ItemCounter ; ///< Item counter - hash m_HashFunctor ; ///< Hash functor - - bucket_type * m_Buckets ; ///< bucket table + item_counter m_ItemCounter; ///< Item counter + hash m_HashFunctor; ///< Hash functor + bucket_type * m_Buckets; ///< bucket table private: //@cond @@ -60,6 +57,7 @@ namespace cds { namespace intrusive { //@endcond protected: + //@cond /// Calculates hash value of \p key template size_t hash_value( Q const & key ) const @@ -73,6 +71,7 @@ namespace cds { namespace intrusive { { return m_Buckets[ hash_value( key ) ]; } + //@endcond public: /// Forward iterator @@ -147,8 +146,7 @@ namespace cds { namespace intrusive { public: /// Initializes hash set - /** - See \ref cds_intrusive_MichaelHashSet_hp "MichaelHashSet" ctor for explanation + /** @copydetails cds_intrusive_MichaelHashSet_hp_ctor */ MichaelHashSet( size_t nMaxItemCount, ///< estimation of max item count in the hash set @@ -156,10 +154,11 @@ namespace cds { namespace intrusive { ) : m_nHashBitmask( michael_set::details::init_hash_bitmask( nMaxItemCount, nLoadFactor )) { // GC and OrderedList::gc must be the same - static_assert(( std::is_same::value ), "GC and OrderedList::gc must be the same"); + static_assert( std::is_same::value, "GC and OrderedList::gc must be the same"); // atomicity::empty_item_counter is not allowed as a item counter - static_assert(( !std::is_same::value ), "atomicity::empty_item_counter is not allowed as a item counter"); + static_assert( !std::is_same::value, + "atomicity::empty_item_counter is not allowed as a item counter"); m_Buckets = bucket_table_allocator().NewArray( bucket_count() ); } @@ -203,14 +202,15 @@ namespace cds { namespace intrusive { If new item has been inserted (i.e. \p bNew is \p true) then \p item and \p val arguments refers to the same thing. - The functor can change non-key fields of the \p item; however, \p func must guarantee - that during changing no any other modifications could be made on this item by concurrent threads. - - You can pass \p func argument by value or by reference using \p std::ref. + The functor can change non-key fields of the \p item. Returns std::pair where \p first is \p true if operation is successfull, \p second is \p true if new item has been added or \p false if the item with \p key already is in the set. + + @warning For \ref cds_intrusive_MichaelList_hp "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting". + \ref cds_intrusive_LazyList_nogc "LazyList" provides exclusive access to inserted item and does not require any node-level + synchronization. */ template std::pair ensure( value_type& val, Func func ) @@ -221,21 +221,21 @@ namespace cds { namespace intrusive { return bRet; } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_MichaelHashSet_nogc_find_val - The function searches the item with key equal to \p val + The function searches the item with key equal to \p key and returns pointer to item found, otherwise \p nullptr. Note the hash functor specified for class \p Traits template parameter should accept a parameter of type \p Q that can be not the same as \p value_type. */ template - value_type * find( Q const& val ) + value_type * find( Q const& key ) { - return bucket( val ).find( val ); + return bucket( key ).find( key ); } - /// Finds the key \p val using \p pred predicate for searching + /// Finds the key \p key using \p pred predicate for searching /** The function is an analog of \ref cds_intrusive_MichaelHashSet_nogc_find_val "find(Q const&)" but \p pred is used for key comparing. @@ -243,43 +243,41 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - value_type * find_with( Q const& val, Less pred ) + value_type * find_with( Q const& key, Less pred ) { - return bucket( val ).find_with( val, pred ); + return bucket( key ).find_with( key, pred ); } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_MichaelHashSet_nogc_find_func - The function searches the item with key equal to \p val and calls the functor \p f for item found. + The function searches the item with key equal to \p key and calls the functor \p f for item found. The interface of \p Func functor is: \code struct functor { - void operator()( value_type& item, Q& val ); + void operator()( value_type& item, Q& key ); }; \endcode - where \p item is the item found, \p val is the find function argument. - - You can pass \p f argument by value or by reference using \p std::ref. + where \p item is the item found, \p key is the find function argument. The functor can change non-key fields of \p item. The functor does not serialize simultaneous access to the set \p item. If such access is possible you must provide your own synchronization schema on item level to exclude unsafe item modifications. - The \p val argument is non-const since it can be used as \p f functor destination i.e., the functor + The \p key argument is non-const since it can be used as \p f functor destination i.e., the functor can modify both arguments. Note the hash functor specified for class \p Traits template parameter should accept a parameter of type \p Q that can be not the same as \p value_type. - The function returns \p true if \p val is found, \p false otherwise. + The function returns \p true if \p key is found, \p false otherwise. */ template - bool find( Q& val, Func f ) + bool find( Q& key, Func f ) { - return bucket( val ).find( val, f ); + return bucket( key ).find( key, f ); } - /// Finds the key \p val using \p pred predicate for searching + /// Finds the key \p key using \p pred predicate for searching /** The function is an analog of \ref cds_intrusive_MichaelHashSet_nogc_find_func "find(Q&, Func)" but \p pred is used for key comparing. @@ -287,50 +285,9 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool find( Q& val, Less pred, Func f ) - { - return bucket( val ).find_with( val, pred, f ); - } - - /// Finds the key \p val - /** \anchor cds_intrusive_MichaelHashSet_nogc_find_cfunc - The function searches the item with key equal to \p val and calls the functor \p f for item found. - The interface of \p Func functor is: - \code - struct functor { - void operator()( value_type& item, Q const& val ); - }; - \endcode - where \p item is the item found, \p val is the find function argument. - - You can pass \p f argument by value or by reference using \p std::ref. - - The functor can change non-key fields of \p item. - The functor does not serialize simultaneous access to the set \p item. If such access is - possible you must provide your own synchronization schema on item level to exclude unsafe item modifications. - - Note the hash functor specified for class \p Traits template parameter - should accept a parameter of type \p Q that can be not the same as \p value_type. - - The function returns \p true if \p val is found, \p false otherwise. - */ - template - bool find( Q const& val, Func f ) - { - return bucket( val ).find( val, f ); - } - - /// Finds the key \p val using \p pred predicate for searching - /** - The function is an analog of \ref cds_intrusive_MichaelHashSet_nogc_find_cfunc "find(Q const&, Func)" - but \p pred is used for key comparing. - \p Less functor has the interface like \p std::less. - \p pred must imply the same element order as the comparator used for building the set. - */ - template - bool find_with( Q const& val, Less pred, Func f ) + bool find_with( Q& key, Less pred, Func f ) { - return bucket( val ).find_with( val, pred, f ); + return bucket( key ).find_with( key, pred, f ); } /// Clears the set (non-atomic) @@ -369,7 +326,7 @@ namespace cds { namespace intrusive { /// Returns the size of hash table /** - Since MichaelHashSet cannot dynamically extend the hash table size, + Since \p %MichaelHashSet cannot dynamically extend the hash table size, the value returned is an constant depending on object initialization parameters; see MichaelHashSet::MichaelHashSet for explanation. */ diff --git a/cds/intrusive/michael_set_rcu.h b/cds/intrusive/michael_set_rcu.h index 164c0c40..69695a6a 100644 --- a/cds/intrusive/michael_set_rcu.h +++ b/cds/intrusive/michael_set_rcu.h @@ -26,8 +26,8 @@ namespace cds { namespace intrusive { The intrusive ordered list implementation specifies the type \p T stored in the hash-set, the reclamation schema \p GC used by hash-set, the comparison functor for the type \p T and other features specific for the ordered list. - - \p Traits - type traits. See michael_set::type_traits for explanation. - Instead of defining \p Traits struct you can use option-based syntax with michael_set::make_traits metafunction. + - \p Traits - type traits, default is \p michael_set::traits. + Instead of defining \p Traits struct you can use option-based syntax with \p michael_set::make_traits metafunction. \par Usage Before including you should include appropriate RCU header file, @@ -66,7 +66,7 @@ namespace cds { namespace intrusive { class RCU, class OrderedList, #ifdef CDS_DOXYGEN_INVOKED - class Traits = michael_set::type_traits + class Traits = michael_set::traits #else class Traits #endif @@ -74,35 +74,34 @@ namespace cds { namespace intrusive { class MichaelHashSet< cds::urcu::gc< RCU >, OrderedList, Traits > { public: - typedef OrderedList bucket_type ; ///< type of ordered list used as a bucket implementation - typedef Traits options ; ///< Traits template parameters + typedef cds::urcu::gc< RCU > gc; ///< RCU schema + typedef OrderedList bucket_type; ///< type of ordered list used as a bucket implementation + typedef Traits traits; ///< Set traits typedef typename bucket_type::value_type value_type ; ///< type of value stored in the list - typedef cds::urcu::gc< RCU > gc ; ///< RCU schema - typedef typename bucket_type::key_comparator key_comparator ; ///< key comparison functor + typedef typename bucket_type::key_comparator key_comparator ; ///< key comparing functor typedef typename bucket_type::disposer disposer ; ///< Node disposer functor /// Hash functor for \ref value_type and all its derivatives that you use - typedef typename cds::opt::v::hash_selector< typename options::hash >::type hash; - typedef typename options::item_counter item_counter ; ///< Item counter type + typedef typename cds::opt::v::hash_selector< typename traits::hash >::type hash; + typedef typename traits::item_counter item_counter; ///< Item counter type /// Bucket table allocator - typedef cds::details::Allocator< bucket_type, typename options::allocator > bucket_table_allocator; + typedef cds::details::Allocator< bucket_type, typename traits::allocator > bucket_table_allocator; - typedef typename bucket_type::rcu_lock rcu_lock ; ///< RCU scoped lock - typedef typename bucket_type::exempt_ptr exempt_ptr ; ///< pointer to extracted node + typedef typename bucket_type::rcu_lock rcu_lock; ///< RCU scoped lock + typedef typename bucket_type::exempt_ptr exempt_ptr; ///< pointer to extracted node /// Group of \p extract_xxx functions require external locking if underlying ordered list requires that static CDS_CONSTEXPR const bool c_bExtractLockExternal = bucket_type::c_bExtractLockExternal; protected: - item_counter m_ItemCounter ; ///< Item counter - hash m_HashFunctor ; ///< Hash functor - - bucket_type * m_Buckets ; ///< bucket table + item_counter m_ItemCounter; ///< Item counter + hash m_HashFunctor; ///< Hash functor + bucket_type * m_Buckets; ///< bucket table private: //@cond - const size_t m_nHashBitmask; + const size_t m_nHashBitmask; //@endcond protected: @@ -213,10 +212,11 @@ namespace cds { namespace intrusive { ) : m_nHashBitmask( michael_set::details::init_hash_bitmask( nMaxItemCount, nLoadFactor )) { // GC and OrderedList::gc must be the same - static_assert(( std::is_same::value ), "GC and OrderedList::gc must be the same"); + static_assert( std::is_same::value, "GC and OrderedList::gc must be the same"); // atomicity::empty_item_counter is not allowed as a item counter - static_assert(( !std::is_same::value ), "atomicity::empty_item_counter is not allowed as a item counter"); + static_assert( !std::is_same::value, + "atomicity::empty_item_counter is not allowed as a item counter"); m_Buckets = bucket_table_allocator().NewArray( bucket_count() ); } @@ -256,10 +256,12 @@ namespace cds { namespace intrusive { \code void func( value_type& val ); \endcode - where \p val is the item inserted. User-defined functor \p f should guarantee that during changing - \p val no any other changes could be made on this set's item by concurrent threads. - The user-defined functor is called only if the inserting is success and can be passed by reference - using \p std::ref. + where \p val is the item inserted. + The user-defined functor is called only if the inserting is success. + + @warning For \ref cds_intrusive_MichaelList_rcu "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting". + \ref cds_intrusive_LazyList_rcu "LazyList" provides exclusive access to inserted item and does not require any node-level + synchronization. */ template bool insert( value_type& val, Func f ) @@ -287,15 +289,16 @@ namespace cds { namespace intrusive { If new item has been inserted (i.e. \p bNew is \p true) then \p item and \p val arguments refers to the same thing. - The functor can change non-key fields of the \p item; however, \p func must guarantee - that during changing no any other modifications could be made on this item by concurrent threads. - - You can pass \p func argument by value or by reference using \p std::ref. + The functor can change non-key fields of the \p item. Returns std::pair where \p first is \p true if operation is successfull, \p second is \p true if new item has been added or \p false if the item with \p key already is in the set. - */ + + @warning For \ref cds_intrusive_MichaelList_rcu "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting". + \ref cds_intrusive_LazyList_rcu "LazyList" provides exclusive access to inserted item and does not require any node-level + synchronization. + */ template std::pair ensure( value_type& val, Func func ) { @@ -322,16 +325,16 @@ namespace cds { namespace intrusive { /// Deletes the item from the set /** \anchor cds_intrusive_MichaelHashSet_rcu_erase - The function searches an item with key equal to \p val in the set, + The function searches an item with key equal to \p key in the set, unlinks it from the set, and returns \p true. - If the item with key equal to \p val is not found the function return \p false. + If the item with key equal to \p key is not found the function return \p false. Note the hash functor should accept a parameter of type \p Q that may be not the same as \p value_type. */ template - bool erase( Q const& val ) + bool erase( Q const& key ) { - if ( bucket( val ).erase( val )) { + if ( bucket( key ).erase( key )) { --m_ItemCounter; return true; } @@ -346,9 +349,9 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool erase_with( Q const& val, Less pred ) + bool erase_with( Q const& key, Less pred ) { - if ( bucket( val ).erase_with( val, pred )) { + if ( bucket( key ).erase_with( key, pred )) { --m_ItemCounter; return true; } @@ -357,7 +360,7 @@ namespace cds { namespace intrusive { /// Deletes the item from the set /** \anchor cds_intrusive_MichaelHashSet_rcu_erase_func - The function searches an item with key equal to \p val in the set, + The function searches an item with key equal to \p key in the set, call \p f functor with item found, and unlinks it from the set. The \ref disposer specified in \p OrderedList class template parameter is called by garbage collector \p GC asynchronously. @@ -370,14 +373,14 @@ namespace cds { namespace intrusive { \endcode The functor may be passed by reference with boost:ref - If the item with key equal to \p val is not found the function return \p false. + If the item with key equal to \p key is not found the function return \p false. Note the hash functor should accept a parameter of type \p Q that can be not the same as \p value_type. */ template - bool erase( const Q& val, Func f ) + bool erase( const Q& key, Func f ) { - if ( bucket( val ).erase( val, f )) { + if ( bucket( key ).erase( key, f )) { --m_ItemCounter; return true; } @@ -392,9 +395,9 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool erase_with( const Q& val, Less pred, Func f ) + bool erase_with( const Q& key, Less pred, Func f ) { - if ( bucket( val ).erase_with( val, pred, f )) { + if ( bucket( key ).erase_with( key, pred, f )) { --m_ItemCounter; return true; } @@ -403,9 +406,9 @@ namespace cds { namespace intrusive { /// Extracts an item from the set /** \anchor cds_intrusive_MichaelHashSet_rcu_extract - The function searches an item with key equal to \p val in the set, + The function searches an item with key equal to \p key in the set, unlinks it from the set, places item pointer into \p dest argument, and returns \p true. - If the item with the key equal to \p val is not found the function return \p false. + If the item with the key equal to \p key is not found the function return \p false. @note The function does NOT call RCU read-side lock or synchronization, and does NOT dispose the item found. It just excludes the item from the set @@ -445,9 +448,9 @@ namespace cds { namespace intrusive { \endcode */ template - bool extract( exempt_ptr& dest, Q const& val ) + bool extract( exempt_ptr& dest, Q const& key ) { - if ( bucket( val ).extract( dest, val )) { + if ( bucket( key ).extract( dest, key )) { --m_ItemCounter; return true; } @@ -462,27 +465,27 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool extract_with( exempt_ptr& dest, Q const& val, Less pred ) + bool extract_with( exempt_ptr& dest, Q const& key, Less pred ) { - if ( bucket( val ).extract_with( dest, val, pred )) { + if ( bucket( key ).extract_with( dest, key, pred )) { --m_ItemCounter; return true; } return false; } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_MichaelHashSet_rcu_find_val - The function searches the item with key equal to \p val - and returns \p true if \p val found or \p false otherwise. + The function searches the item with key equal to \p key + and returns \p true if \p key found or \p false otherwise. */ template - bool find( Q const& val ) const + bool find( Q const& key ) const { - return bucket( val ).find( val ); + return bucket( key ).find( key ); } - /// Finds the key \p val using \p pred predicate for searching + /// Finds the key \p key using \p pred predicate for searching /** The function is an analog of \ref cds_intrusive_MichaelHashSet_rcu_find_val "find(Q const&)" but \p pred is used for key comparing. @@ -490,43 +493,41 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool find_with( Q const& val, Less pred ) const + bool find_with( Q const& key, Less pred ) const { - return bucket( val ).find_with( val, pred ); + return bucket( key ).find_with( key, pred ); } - /// Find the key \p val + /// Find the key \p key /** \anchor cds_intrusive_MichaelHashSet_rcu_find_func - The function searches the item with key equal to \p val and calls the functor \p f for item found. + The function searches the item with key equal to \p key and calls the functor \p f for item found. The interface of \p Func functor is: \code struct functor { - void operator()( value_type& item, Q& val ); + void operator()( value_type& item, Q& key ); }; \endcode - where \p item is the item found, \p val is the find function argument. - - You can pass \p f argument by value or by reference using \p std::ref. + where \p item is the item found, \p key is the find function argument. The functor can change non-key fields of \p item. The functor does not serialize simultaneous access to the set \p item. If such access is possible you must provide your own synchronization schema on item level to exclude unsafe item modifications. - The \p val argument is non-const since it can be used as \p f functor destination i.e., the functor + The \p key argument is non-const since it can be used as \p f functor destination i.e., the functor can modify both arguments. Note the hash functor specified for class \p Traits template parameter should accept a parameter of type \p Q that can be not the same as \p value_type. - The function returns \p true if \p val is found, \p false otherwise. + The function returns \p true if \p key is found, \p false otherwise. */ template - bool find( Q& val, Func f ) const + bool find( Q& key, Func f ) const { - return bucket( val ).find( val, f ); + return bucket( key ).find( key, f ); } - /// Finds the key \p val using \p pred predicate for searching + /// Finds the key \p key using \p pred predicate for searching /** The function is an analog of \ref cds_intrusive_MichaelHashSet_rcu_find_func "find(Q&, Func)" but \p pred is used for key comparing. @@ -534,56 +535,15 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - bool find_with( Q& val, Less pred, Func f ) const - { - return bucket( val ).find_with( val, pred, f ); - } - - /// Find the key \p val - /** \anchor cds_intrusive_MichaelHashSet_rcu_find_cfunc - The function searches the item with key equal to \p val and calls the functor \p f for item found. - The interface of \p Func functor is: - \code - struct functor { - void operator()( value_type& item, Q const& val ); - }; - \endcode - where \p item is the item found, \p val is the find function argument. - - You can pass \p f argument by value or by reference using \p std::ref. - - The functor can change non-key fields of \p item. - The functor does not serialize simultaneous access to the set \p item. If such access is - possible you must provide your own synchronization schema on item level to exclude unsafe item modifications. - - Note the hash functor specified for class \p Traits template parameter - should accept a parameter of type \p Q that can be not the same as \p value_type. - - The function returns \p true if \p val is found, \p false otherwise. - */ - template - bool find( Q const& val, Func f ) const - { - return bucket( val ).find( val, f ); - } - - /// Finds the key \p val using \p pred predicate for searching - /** - The function is an analog of \ref cds_intrusive_MichaelHashSet_rcu_find_cfunc "find(Q const&, Func)" - but \p pred is used for key comparing. - \p Less functor has the interface like \p std::less. - \p pred must imply the same element order as the comparator used for building the set. - */ - template - bool find_with( Q const& val, Less pred, Func f ) const + bool find_with( Q& key, Less pred, Func f ) const { - return bucket( val ).find_with( val, pred, f ); + return bucket( key ).find_with( key, pred, f ); } - /// Finds the key \p val and return the item found + /// Finds the key \p key and return the item found /** \anchor cds_intrusive_MichaelHashSet_rcu_get - The function searches the item with key equal to \p val and returns the pointer to item found. - If \p val is not found it returns \p nullptr. + The function searches the item with key equal to \p key and returns the pointer to item found. + If \p key is not found it returns \p nullptr. Note the compare functor should accept a parameter of type \p Q that can be not the same as \p value_type. @@ -608,12 +568,12 @@ namespace cds { namespace intrusive { \endcode */ template - value_type * get( Q const& val ) const + value_type * get( Q const& key ) const { - return bucket( val ).get( val ); + return bucket( key ).get( key ); } - /// Finds the key \p val and return the item found + /// Finds the key \p key and return the item found /** The function is an analog of \ref cds_intrusive_MichaelHashSet_rcu_get "get(Q const&)" but \p pred is used for comparing the keys. @@ -623,9 +583,9 @@ namespace cds { namespace intrusive { \p pred must imply the same element order as the comparator used for building the set. */ template - value_type * get_with( Q const& val, Less pred ) const + value_type * get_with( Q const& key, Less pred ) const { - return bucket( val ).get_with( val, pred ); + return bucket( key ).get_with( key, pred ); } /// Clears the set (non-atomic) diff --git a/projects/Win/vc12/hdr-test-set.vcxproj b/projects/Win/vc12/hdr-test-set.vcxproj index d2f8b602..1f6e998d 100644 --- a/projects/Win/vc12/hdr-test-set.vcxproj +++ b/projects/Win/vc12/hdr-test-set.vcxproj @@ -543,12 +543,12 @@ + + - - diff --git a/projects/Win/vc12/hdr-test-set.vcxproj.filters b/projects/Win/vc12/hdr-test-set.vcxproj.filters index 1d53f3e6..5fe49abc 100644 --- a/projects/Win/vc12/hdr-test-set.vcxproj.filters +++ b/projects/Win/vc12/hdr-test-set.vcxproj.filters @@ -59,12 +59,6 @@ intrusive\michael_set - - intrusive\michael_set - - - intrusive\michael_set - intrusive\michael_set @@ -311,5 +305,11 @@ container\split_list + + intrusive\michael_set + + + intrusive\michael_set + \ No newline at end of file diff --git a/projects/source.test-hdr.mk b/projects/source.test-hdr.mk index c2b0f70d..66a6a7ab 100644 --- a/projects/source.test-hdr.mk +++ b/projects/source.test-hdr.mk @@ -130,7 +130,6 @@ CDS_TESTHDR_QUEUE := \ tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp CDS_TESTHDR_SET := \ - tests/test-hdr/set/hdr_intrusive_michael_set_hrc_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_refinable_hashset_avlset.cpp \ tests/test-hdr/set/hdr_intrusive_refinable_hashset_list.cpp \ tests/test-hdr/set/hdr_intrusive_refinable_hashset_set.cpp \ @@ -159,7 +158,7 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_intrusive_striped_hashset_uset.cpp \ tests/test-hdr/set/hdr_intrusive_striped_set.cpp \ tests/test-hdr/set/hdr_michael_set_hp.cpp \ - tests/test-hdr/set/hdr_michael_set_ptb.cpp \ + tests/test-hdr/set/hdr_michael_set_dhp.cpp \ tests/test-hdr/set/hdr_michael_set_rcu_gpi.cpp \ tests/test-hdr/set/hdr_michael_set_rcu_gpb.cpp \ tests/test-hdr/set/hdr_michael_set_rcu_gpt.cpp \ @@ -167,8 +166,7 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_michael_set_rcu_sht.cpp \ tests/test-hdr/set/hdr_michael_set_nogc.cpp \ tests/test-hdr/set/hdr_michael_set_lazy_hp.cpp \ - tests/test-hdr/set/hdr_michael_set_lazy_hrc.cpp \ - tests/test-hdr/set/hdr_michael_set_lazy_ptb.cpp \ + tests/test-hdr/set/hdr_michael_set_lazy_dhp.cpp \ tests/test-hdr/set/hdr_michael_set_lazy_rcu_gpi.cpp \ tests/test-hdr/set/hdr_michael_set_lazy_rcu_gpb.cpp \ tests/test-hdr/set/hdr_michael_set_lazy_rcu_gpt.cpp \ @@ -187,8 +185,7 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_refinable_hashset_slist.cpp \ tests/test-hdr/set/hdr_refinable_hashset_vector.cpp \ tests/test-hdr/set/hdr_skiplist_set_hp.cpp \ - tests/test-hdr/set/hdr_skiplist_set_hrc.cpp \ - tests/test-hdr/set/hdr_skiplist_set_ptb.cpp \ + tests/test-hdr/set/hdr_skiplist_set_dhp.cpp \ tests/test-hdr/set/hdr_skiplist_set_rcu_gpi.cpp \ tests/test-hdr/set/hdr_skiplist_set_rcu_gpb.cpp \ tests/test-hdr/set/hdr_skiplist_set_rcu_gpt.cpp \ @@ -197,16 +194,15 @@ CDS_TESTHDR_SET := \ tests/test-hdr/set/hdr_skiplist_set_nogc.cpp \ tests/test-hdr/set/hdr_splitlist_set_hp.cpp \ tests/test-hdr/set/hdr_splitlist_set_nogc.cpp \ - tests/test-hdr/set/hdr_splitlist_set_ptb.cpp \ + tests/test-hdr/set/hdr_splitlist_set_dhp.cpp \ tests/test-hdr/set/hdr_splitlist_set_rcu_gpi.cpp \ tests/test-hdr/set/hdr_splitlist_set_rcu_gpb.cpp \ tests/test-hdr/set/hdr_splitlist_set_rcu_gpt.cpp \ tests/test-hdr/set/hdr_splitlist_set_rcu_shb.cpp \ tests/test-hdr/set/hdr_splitlist_set_rcu_sht.cpp \ tests/test-hdr/set/hdr_splitlist_set_lazy_hp.cpp \ - tests/test-hdr/set/hdr_splitlist_set_lazy_hrc.cpp \ tests/test-hdr/set/hdr_splitlist_set_lazy_nogc.cpp \ - tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp \ + tests/test-hdr/set/hdr_splitlist_set_lazy_dhp.cpp \ tests/test-hdr/set/hdr_splitlist_set_lazy_rcu_gpi.cpp \ tests/test-hdr/set/hdr_splitlist_set_lazy_rcu_gpb.cpp \ tests/test-hdr/set/hdr_splitlist_set_lazy_rcu_gpt.cpp \ diff --git a/projects/source.test-hdr.offsetof.mk b/projects/source.test-hdr.offsetof.mk index 999ef143..b9a06829 100644 --- a/projects/source.test-hdr.offsetof.mk +++ b/projects/source.test-hdr.offsetof.mk @@ -8,7 +8,7 @@ CDS_TESTHDR_OFFSETOF_SET := \ tests/test-hdr/set/hdr_intrusive_cuckoo_set.cpp \ tests/test-hdr/set/hdr_intrusive_cuckoo_refinable_set.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_hp.cpp \ - tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp \ + tests/test-hdr/set/hdr_intrusive_michael_set_dhp.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_nogc.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpb.cpp \ @@ -16,7 +16,7 @@ CDS_TESTHDR_OFFSETOF_SET := \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_shb.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_sht.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_hp_lazy.cpp \ - tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp \ + tests/test-hdr/set/hdr_intrusive_michael_set_dhp_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_nogc_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpb_lazy.cpp \ @@ -24,7 +24,7 @@ CDS_TESTHDR_OFFSETOF_SET := \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_shb_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_michael_set_rcu_sht_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_hp_member.cpp \ - tests/test-hdr/set/hdr_intrusive_skiplist_ptb_member.cpp \ + tests/test-hdr/set/hdr_intrusive_skiplist_dhp_member.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpi_member.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpb_member.cpp \ tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpt_member.cpp \ @@ -33,7 +33,7 @@ CDS_TESTHDR_OFFSETOF_SET := \ tests/test-hdr/set/hdr_intrusive_skiplist_nogc_member.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_hp.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc.cpp \ - tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp \ + tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_gpb.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_gpi.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_gpt.cpp \ @@ -41,7 +41,7 @@ CDS_TESTHDR_OFFSETOF_SET := \ tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_sht.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_hp_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc_lazy.cpp \ - tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp \ + tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_gpb_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_gpi_lazy.cpp \ tests/test-hdr/set/hdr_intrusive_splitlist_set_rcu_gpt_lazy.cpp \ diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_dhp.cpp similarity index 69% rename from tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp rename to tests/test-hdr/set/hdr_intrusive_michael_set_dhp.cpp index 016f125e..8647afd9 100644 --- a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb.cpp +++ b/tests/test-hdr/set/hdr_intrusive_michael_set_dhp.cpp @@ -6,19 +6,19 @@ namespace set { - void IntrusiveHashSetHdrTest::PTB_base_cmp() + void IntrusiveHashSetHdrTest::DHP_base_cmp() { - typedef base_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::PTB + typedef base_int_item< ci::michael_list::node > item; + typedef ci::MichaelList< cds::gc::DHP ,item ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > + ci::opt::hook< ci::michael_list::base_hook< co::gc > > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -27,19 +27,19 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_base_less() + void IntrusiveHashSetHdrTest::DHP_base_less() { - typedef base_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::PTB + typedef base_int_item< ci::michael_list::node > item; + typedef ci::MichaelList< cds::gc::DHP ,item ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > + ci::opt::hook< ci::michael_list::base_hook< co::gc > > ,co::less< less > ,ci::opt::disposer< faked_disposer > >::type - > bucket_type; + > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -48,20 +48,20 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_base_cmpmix() + void IntrusiveHashSetHdrTest::DHP_base_cmpmix() { - typedef base_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::PTB + typedef base_int_item< ci::michael_list::node > item; + typedef ci::MichaelList< cds::gc::DHP ,item ,ci::michael_list::make_traits< - ci::opt::hook< ci::michael_list::base_hook< co::gc > > + ci::opt::hook< ci::michael_list::base_hook< co::gc > > ,co::less< less > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > ,co::item_counter< simple_item_counter > @@ -71,22 +71,22 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_member_cmp() + void IntrusiveHashSetHdrTest::DHP_member_cmp() { - typedef member_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::PTB + typedef member_int_item< ci::michael_list::node > item; + typedef ci::MichaelList< cds::gc::DHP ,item ,ci::michael_list::make_traits< ci::opt::hook< ci::michael_list::member_hook< offsetof( item, hMember ), - co::gc + co::gc > > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -95,22 +95,22 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_member_less() + void IntrusiveHashSetHdrTest::DHP_member_less() { - typedef member_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::PTB + typedef member_int_item< ci::michael_list::node > item; + typedef ci::MichaelList< cds::gc::DHP ,item ,ci::michael_list::make_traits< ci::opt::hook< ci::michael_list::member_hook< offsetof( item, hMember ), - co::gc + co::gc > > ,co::less< less > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -119,15 +119,15 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_member_cmpmix() + void IntrusiveHashSetHdrTest::DHP_member_cmpmix() { - typedef member_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< cds::gc::PTB + typedef member_int_item< ci::michael_list::node > item; + typedef ci::MichaelList< cds::gc::DHP ,item ,ci::michael_list::make_traits< ci::opt::hook< ci::michael_list::member_hook< offsetof( item, hMember ), - co::gc + co::gc > > ,co::compare< cmp > ,co::less< less > @@ -135,7 +135,7 @@ namespace set { >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > ,co::item_counter< simple_item_counter > diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_dhp_lazy.cpp similarity index 66% rename from tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp rename to tests/test-hdr/set/hdr_intrusive_michael_set_dhp_lazy.cpp index aebf530d..53dc1225 100644 --- a/tests/test-hdr/set/hdr_intrusive_michael_set_ptb_lazy.cpp +++ b/tests/test-hdr/set/hdr_intrusive_michael_set_dhp_lazy.cpp @@ -6,19 +6,19 @@ namespace set { - void IntrusiveHashSetHdrTest::PTB_base_cmp_lazy() + void IntrusiveHashSetHdrTest::DHP_base_cmp_lazy() { - typedef base_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< cds::gc::PTB + typedef base_int_item< ci::lazy_list::node > item; + typedef ci::LazyList< cds::gc::DHP ,item ,ci::lazy_list::make_traits< - ci::opt::hook< ci::lazy_list::base_hook< co::gc > > + ci::opt::hook< ci::lazy_list::base_hook< co::gc > > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -27,19 +27,19 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_base_less_lazy() + void IntrusiveHashSetHdrTest::DHP_base_less_lazy() { - typedef base_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< cds::gc::PTB + typedef base_int_item< ci::lazy_list::node > item; + typedef ci::LazyList< cds::gc::DHP ,item ,ci::lazy_list::make_traits< - ci::opt::hook< ci::lazy_list::base_hook< co::gc > > + ci::opt::hook< ci::lazy_list::base_hook< co::gc > > ,co::less< less > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -48,20 +48,20 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_base_cmpmix_lazy() + void IntrusiveHashSetHdrTest::DHP_base_cmpmix_lazy() { - typedef base_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< cds::gc::PTB + typedef base_int_item< ci::lazy_list::node > item; + typedef ci::LazyList< cds::gc::DHP ,item ,ci::lazy_list::make_traits< - ci::opt::hook< ci::lazy_list::base_hook< co::gc > > + ci::opt::hook< ci::lazy_list::base_hook< co::gc > > ,co::less< less > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > ,co::item_counter< simple_item_counter > @@ -71,22 +71,22 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_member_cmp_lazy() + void IntrusiveHashSetHdrTest::DHP_member_cmp_lazy() { - typedef member_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< cds::gc::PTB + typedef member_int_item< ci::lazy_list::node > item; + typedef ci::LazyList< cds::gc::DHP ,item ,ci::lazy_list::make_traits< ci::opt::hook< ci::lazy_list::member_hook< offsetof( item, hMember ), - co::gc + co::gc > > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -95,22 +95,22 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_member_less_lazy() + void IntrusiveHashSetHdrTest::DHP_member_less_lazy() { - typedef member_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< cds::gc::PTB + typedef member_int_item< ci::lazy_list::node > item; + typedef ci::LazyList< cds::gc::DHP ,item ,ci::lazy_list::make_traits< ci::opt::hook< ci::lazy_list::member_hook< offsetof( item, hMember ), - co::gc + co::gc > > ,co::less< less > ,ci::opt::disposer< faked_disposer > >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > >::type @@ -119,15 +119,15 @@ namespace set { test_int(); } - void IntrusiveHashSetHdrTest::PTB_member_cmpmix_lazy() + void IntrusiveHashSetHdrTest::DHP_member_cmpmix_lazy() { - typedef member_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< cds::gc::PTB + typedef member_int_item< ci::lazy_list::node > item; + typedef ci::LazyList< cds::gc::DHP ,item ,ci::lazy_list::make_traits< ci::opt::hook< ci::lazy_list::member_hook< offsetof( item, hMember ), - co::gc + co::gc > > ,co::compare< cmp > ,co::less< less > @@ -135,7 +135,7 @@ namespace set { >::type > bucket_type; - typedef ci::MichaelHashSet< cds::gc::PTB, bucket_type, + typedef ci::MichaelHashSet< cds::gc::DHP, bucket_type, ci::michael_set::make_traits< co::hash< hash_int > ,co::item_counter< simple_item_counter > diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_hp_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_hp_lazy.cpp index e409ce89..009c1b69 100644 --- a/tests/test-hdr/set/hdr_intrusive_michael_set_hp_lazy.cpp +++ b/tests/test-hdr/set/hdr_intrusive_michael_set_hp_lazy.cpp @@ -9,15 +9,15 @@ namespace set { void IntrusiveHashSetHdrTest::HP_base_cmp_lazy() { typedef base_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< cds::gc::HP - ,item - ,ci::lazy_list::make_traits< + struct list_traits : + public ci::lazy_list::make_traits< ci::opt::hook< ci::lazy_list::base_hook< co::gc > > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > ,ci::opt::back_off< cds::backoff::pause > >::type - > bucket_type; + {}; + typedef ci::LazyList< cds::gc::HP, item, list_traits > bucket_type; typedef ci::MichaelHashSet< cds::gc::HP, bucket_type, ci::michael_set::make_traits< diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi.cpp index 51e95e75..a126d611 100644 --- a/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi.cpp +++ b/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi.cpp @@ -14,20 +14,20 @@ namespace set { void IntrusiveHashSetHdrTest::RCU_GPI_base_cmp() { typedef base_int_item< ci::michael_list::node > item; - typedef ci::MichaelList< RCU - ,item - ,ci::michael_list::make_traits< + struct list_traits : + public ci::michael_list::make_traits< ci::opt::hook< ci::michael_list::base_hook< co::gc > > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > >::type - > bucket_type; - - typedef ci::MichaelHashSet< RCU, bucket_type, - ci::michael_set::make_traits< - co::hash< hash_int > - >::type - > set; + {}; + typedef ci::MichaelList< RCU, item, list_traits > bucket_type; + + struct set_traits : public ci::michael_set::traits + { + typedef hash_int hash; + }; + typedef ci::MichaelHashSet< RCU, bucket_type, set_traits > set; test_rcu_int(); } diff --git a/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi_lazy.cpp index cae46da2..e0fc913a 100644 --- a/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi_lazy.cpp +++ b/tests/test-hdr/set/hdr_intrusive_michael_set_rcu_gpi_lazy.cpp @@ -13,21 +13,22 @@ namespace set { void IntrusiveHashSetHdrTest::RCU_GPI_base_cmp_lazy() { typedef base_int_item< ci::lazy_list::node > item; - typedef ci::LazyList< RCU - ,item - ,ci::lazy_list::make_traits< + struct list_traits : + public ci::lazy_list::make_traits< ci::opt::hook< ci::lazy_list::base_hook< co::gc > > ,co::compare< cmp > ,ci::opt::disposer< faked_disposer > ,ci::opt::back_off< cds::backoff::pause > >::type - > bucket_type; + {}; - typedef ci::MichaelHashSet< RCU, bucket_type, - ci::michael_set::make_traits< - co::hash< hash_int > - >::type - > set; + typedef ci::LazyList< RCU, item, list_traits > bucket_type; + + struct set_traits : public ci::michael_set::traits + { + typedef hash_int hash; + }; + typedef ci::MichaelHashSet< RCU, bucket_type, set_traits > set; test_rcu_int(); } diff --git a/tests/test-hdr/set/hdr_intrusive_set.h b/tests/test-hdr/set/hdr_intrusive_set.h index 678076ec..49645afc 100644 --- a/tests/test-hdr/set/hdr_intrusive_set.h +++ b/tests/test-hdr/set/hdr_intrusive_set.h @@ -1058,12 +1058,12 @@ namespace set { void HP_member_less(); void HP_member_cmpmix(); - void PTB_base_cmp(); - void PTB_base_less(); - void PTB_base_cmpmix(); - void PTB_member_cmp(); - void PTB_member_less(); - void PTB_member_cmpmix(); + void DHP_base_cmp(); + void DHP_base_less(); + void DHP_base_cmpmix(); + void DHP_member_cmp(); + void DHP_member_less(); + void DHP_member_cmpmix(); void RCU_GPI_base_cmp(); void RCU_GPI_base_less(); @@ -1115,12 +1115,12 @@ namespace set { void HP_member_less_lazy(); void HP_member_cmpmix_lazy(); - void PTB_base_cmp_lazy(); - void PTB_base_less_lazy(); - void PTB_base_cmpmix_lazy(); - void PTB_member_cmp_lazy(); - void PTB_member_less_lazy(); - void PTB_member_cmpmix_lazy(); + void DHP_base_cmp_lazy(); + void DHP_base_less_lazy(); + void DHP_base_cmpmix_lazy(); + void DHP_member_cmp_lazy(); + void DHP_member_less_lazy(); + void DHP_member_cmpmix_lazy(); void RCU_GPI_base_cmp_lazy(); void RCU_GPI_base_less_lazy(); @@ -1383,12 +1383,12 @@ namespace set { CPPUNIT_TEST(HP_member_less) CPPUNIT_TEST(HP_member_cmpmix) - CPPUNIT_TEST(PTB_base_cmp) - CPPUNIT_TEST(PTB_base_less) - CPPUNIT_TEST(PTB_base_cmpmix) - CPPUNIT_TEST(PTB_member_cmp) - CPPUNIT_TEST(PTB_member_less) - CPPUNIT_TEST(PTB_member_cmpmix) + CPPUNIT_TEST(DHP_base_cmp) + CPPUNIT_TEST(DHP_base_less) + CPPUNIT_TEST(DHP_base_cmpmix) + CPPUNIT_TEST(DHP_member_cmp) + CPPUNIT_TEST(DHP_member_less) + CPPUNIT_TEST(DHP_member_cmpmix) CPPUNIT_TEST(RCU_GPI_base_cmp) CPPUNIT_TEST(RCU_GPI_base_less) @@ -1439,12 +1439,12 @@ namespace set { CPPUNIT_TEST(HP_member_less_lazy) CPPUNIT_TEST(HP_member_cmpmix_lazy) - CPPUNIT_TEST(PTB_base_cmp_lazy) - CPPUNIT_TEST(PTB_base_less_lazy) - CPPUNIT_TEST(PTB_base_cmpmix_lazy) - CPPUNIT_TEST(PTB_member_cmp_lazy) - CPPUNIT_TEST(PTB_member_less_lazy) - CPPUNIT_TEST(PTB_member_cmpmix_lazy) + CPPUNIT_TEST(DHP_base_cmp_lazy) + CPPUNIT_TEST(DHP_base_less_lazy) + CPPUNIT_TEST(DHP_base_cmpmix_lazy) + CPPUNIT_TEST(DHP_member_cmp_lazy) + CPPUNIT_TEST(DHP_member_less_lazy) + CPPUNIT_TEST(DHP_member_cmpmix_lazy) CPPUNIT_TEST(RCU_GPI_base_cmp_lazy) CPPUNIT_TEST(RCU_GPI_base_less_lazy) -- 2.34.1