From ea5e0542441085eda02bef4656b9c2a3fff5a66e Mon Sep 17 00:00:00 2001 From: khizmax Date: Tue, 28 Oct 2014 10:19:11 +0300 Subject: [PATCH] intrusive::SplitListSet refactoring --- cds/intrusive/details/split_list_base.h | 10 +- cds/intrusive/lazy_list_nogc.h | 2 +- cds/intrusive/split_list.h | 7 +- cds/intrusive/split_list_nogc.h | 186 +++++------- cds/intrusive/split_list_rcu.h | 271 ++++++++---------- tests/test-hdr/set/hdr_intrusive_set.h | 113 ++++++-- .../set/hdr_intrusive_splitlist_set_dhp.cpp | 106 +++++++ .../hdr_intrusive_splitlist_set_dhp_lazy.cpp | 103 +++++++ .../set/hdr_intrusive_splitlist_set_hp.cpp | 129 ++++++++- .../hdr_intrusive_splitlist_set_hp_lazy.cpp | 133 ++++++++- .../set/hdr_intrusive_splitlist_set_nogc.cpp | 104 +++++++ .../hdr_intrusive_splitlist_set_nogc_lazy.cpp | 104 +++++++ 12 files changed, 960 insertions(+), 308 deletions(-) diff --git a/cds/intrusive/details/split_list_base.h b/cds/intrusive/details/split_list_base.h index e286e474..a5d52720 100644 --- a/cds/intrusive/details/split_list_base.h +++ b/cds/intrusive/details/split_list_base.h @@ -221,6 +221,8 @@ namespace cds { namespace intrusive { - \p split_list::dynamic_bucket_table - use dynamic or static bucket table implementation. Dynamic bucket table expands its size up to maximum bucket count when necessary - \p opt::back_off - back-off strategy used for spinning, defult is \p cds::backoff::Default. + - \p opt::stat - internal statistics, default is \p split_list::empty_stat (disabled). + To enable internal statistics use \p split_list::stat. */ template struct make_traits { @@ -649,11 +651,11 @@ namespace cds { namespace intrusive { {} }; - template - class rebind_list_options + template + class rebind_list_traits { typedef OrderedList native_ordered_list; - typedef Options options; + typedef Traits traits; typedef typename native_ordered_list::gc gc; typedef typename native_ordered_list::key_comparator native_key_comparator; @@ -706,7 +708,7 @@ namespace cds { namespace intrusive { { splitlist_node_type * p = static_cast( node_traits::to_node_ptr( v )); if ( p->is_dummy() ) - dummy_node_disposer()( p ); + dummy_node_disposer()( p ); else native_disposer()( v ); } diff --git a/cds/intrusive/lazy_list_nogc.h b/cds/intrusive/lazy_list_nogc.h index ad710ce9..6eb74189 100644 --- a/cds/intrusive/lazy_list_nogc.h +++ b/cds/intrusive/lazy_list_nogc.h @@ -83,7 +83,7 @@ namespace cds { namespace intrusive { //@cond // Rebind traits (split-list support) template - struct rebind_options { + struct rebind_traits { typedef LazyList< gc , value_type diff --git a/cds/intrusive/split_list.h b/cds/intrusive/split_list.h index 5aa0efce..87cabecc 100644 --- a/cds/intrusive/split_list.h +++ b/cds/intrusive/split_list.h @@ -197,7 +197,7 @@ namespace cds { namespace intrusive { protected: //@cond - typedef split_list::details::rebind_list_options wrapped_ordered_list; + typedef split_list::details::rebind_list_traits wrapped_ordered_list; //@endcond public: @@ -439,10 +439,11 @@ namespace cds { namespace intrusive { void init() { // 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"); // Initialize bucket 0 dummy_node_type * pNode = alloc_dummy_node( 0 /*split_list::dummy_hash(0)*/ ); diff --git a/cds/intrusive/split_list_nogc.h b/cds/intrusive/split_list_nogc.h index a6f47f13..28e7124d 100644 --- a/cds/intrusive/split_list_nogc.h +++ b/cds/intrusive/split_list_nogc.h @@ -19,49 +19,48 @@ namespace cds { namespace intrusive { The template parameter \p OrderedList should be any gc::nogc-derived ordered list, for example, \ref cds_intrusive_MichaelList_nogc "persistent MichaelList", \ref cds_intrusive_LazyList_nogc "persistent LazyList" - - The interface of the specialization is a slightly different. */ template < class OrderedList, #ifdef CDS_DOXYGEN_INVOKED - class Traits = split_list::type_traits + class Traits = split_list::traits #else class Traits #endif > - class SplitListSet< gc::nogc, OrderedList, Traits > + class SplitListSet< cds::gc::nogc, OrderedList, Traits > { public: - typedef Traits options ; ///< Traits template parameters - typedef gc::nogc gc ; ///< Garbage collector + typedef cds::gc::nogc gc; ///< Garbage collector + typedef Traits traits; ///< Traits template parameters - /// 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; + /// 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; protected: //@cond - typedef split_list::details::rebind_list_options wrapped_ordered_list; + typedef split_list::details::rebind_list_traits wrapped_ordered_list; //@endcond public: # ifdef CDS_DOXYGEN_INVOKED - typedef OrderedList ordered_list ; ///< type of ordered list used as base for split-list + typedef OrderedList ordered_list; ///< type of ordered list used as base for split-list # else - typedef typename wrapped_ordered_list::result ordered_list; + typedef typename wrapped_ordered_list::result ordered_list; # endif - typedef typename ordered_list::value_type value_type ; ///< type of value stored in the split-list - typedef typename ordered_list::key_comparator key_comparator ; ///< key comparison functor - typedef typename ordered_list::disposer disposer ; ///< Node disposer functor + typedef typename ordered_list::value_type value_type; ///< type of value stored in the split-list + typedef typename ordered_list::key_comparator key_comparator; ///< key comparison functor + typedef typename ordered_list::disposer disposer; ///< Node disposer functor - typedef typename options::item_counter item_counter ; ///< Item counter type - typedef typename options::back_off back_off ; ///< back-off strategy for spinning - typedef typename options::memory_model memory_model ; ///< Memory ordering. See cds::opt::memory_model option + typedef typename traits::item_counter item_counter; ///< Item counter type + typedef typename traits::back_off back_off; ///< back-off strategy + typedef typename traits::memory_model memory_model; ///< Memory ordering. See cds::opt::memory_model option + typedef typename traits::stat stat; ///< Internal statistics, see \p spit_list::stat protected: - typedef typename ordered_list::node_type list_node_type ; ///< Node type as declared in ordered list - typedef split_list::node node_type ; ///< split-list node type - typedef node_type dummy_node_type ; ///< dummy node type + typedef typename ordered_list::node_type list_node_type; ///< Node type as declared in ordered list + typedef split_list::node node_type; ///< split-list node type + typedef node_type dummy_node_type; ///< dummy node type /// Split-list node traits /** @@ -73,10 +72,10 @@ namespace cds { namespace intrusive { //@cond /// Bucket table implementation typedef typename split_list::details::bucket_table_selector< - options::dynamic_bucket_table + traits::dynamic_bucket_table , gc , dummy_node_type - , opt::allocator< typename options::allocator > + , opt::allocator< typename traits::allocator > , opt::memory_model< memory_model > >::type bucket_table; @@ -138,22 +137,26 @@ namespace cds { namespace intrusive { //@endcond protected: - ordered_list_wrapper m_List ; ///< Ordered list containing split-list items - bucket_table m_Buckets ; ///< bucket table - atomics::atomic m_nBucketCountLog2 ; ///< log2( current bucket count ) - item_counter m_ItemCounter ; ///< Item counter - hash m_HashFunctor ; ///< Hash functor + ordered_list_wrapper m_List; ///< Ordered list containing split-list items + bucket_table m_Buckets; ///< bucket table + atomics::atomic m_nBucketCountLog2; ///< log2( current bucket count ) + item_counter m_ItemCounter; ///< Item counter + hash m_HashFunctor; ///< Hash functor + stat m_Stat; ///< Internal statistics protected: //@cond - typedef cds::details::Allocator< dummy_node_type, typename options::allocator > dummy_node_allocator; - static dummy_node_type * alloc_dummy_node( size_t nHash ) + typedef cds::details::Allocator< dummy_node_type, typename traits::allocator > dummy_node_allocator; + + dummy_node_type * alloc_dummy_node( size_t nHash ) { + m_Stat.onHeadNodeAllocated(); return dummy_node_allocator().New( nHash ); } - static void free_dummy_node( dummy_node_type * p ) + void free_dummy_node( dummy_node_type * p ) { dummy_node_allocator().Delete( p ); + m_Stat.onHeadNodeFreed(); } /// Calculates hash value of \p key @@ -182,6 +185,7 @@ namespace cds { namespace intrusive { dummy_node_type * pParentBucket = m_Buckets.bucket( nParent ); if ( pParentBucket == nullptr ) { pParentBucket = init_bucket( nParent ); + m_Stat.onRecursiveInitBucket(); } assert( pParentBucket != nullptr ); @@ -191,6 +195,7 @@ namespace cds { namespace intrusive { dummy_node_type * pBucket = alloc_dummy_node( split_list::dummy_hash( nBucket ) ); if ( m_List.insert_aux_node( pParentBucket, pBucket ) ) { m_Buckets.bucket( nBucket, pBucket ); + m_Stat.onNewBucket(); return pBucket; } free_dummy_node( pBucket ); @@ -202,12 +207,14 @@ namespace cds { namespace intrusive { // The compiler can decide that waiting loop can be "optimized" (stripped) // To prevent this situation, we use waiting on volatile bucket_head_ptr pointer. // + m_Stat.onBucketInitContenton(); back_off bkoff; while ( true ) { dummy_node_type volatile * p = m_Buckets.bucket( nBucket ); if ( p && p != nullptr ) return const_cast( p ); bkoff(); + m_Stat.onBusyWaitBucketInit(); } } @@ -227,10 +234,11 @@ namespace cds { namespace intrusive { void init() { // 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"); // Initialize bucket 0 dummy_node_type * pNode = alloc_dummy_node( 0 /*split_list::dummy_hash(0)*/ ); @@ -308,14 +316,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 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 given key already is in the set. + + @warning For \ref cds_intrusive_MichaelList_nogc "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 ) @@ -324,24 +333,24 @@ namespace cds { namespace intrusive { return std::make_pair( ret.first != end(), ret.second ); } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_SplitListSet_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 or , and \p nullptr 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 - value_type * find( Q const & val ) + value_type * find( Q const& key ) { - iterator it = find_( val ); + iterator it = find_( key ); if ( it == end() ) return nullptr; return &*it; } - /// Finds the key \p val with \p pred predicate for comparing + /// Finds the key \p key with \p pred predicate for comparing /** The function is an analog of \ref cds_intrusive_SplitListSet_nogc_find_val "find(Q const&)" but \p cmp is used for key compare. @@ -349,46 +358,41 @@ namespace cds { namespace intrusive { \p cmp 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 ) { - iterator it = find_with_( val, pred ); + iterator it = find_with_( key, pred ); if ( it == end() ) return nullptr; return &*it; } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_SplitListSet_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 - 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 find_( val, key_comparator(), f ); + return find_( key, key_comparator(), f ); } - /// Finds the key \p val with \p pred predicate for comparing + /// Finds the key \p key with \p pred predicate for comparing /** The function is an analog of \ref cds_intrusive_SplitListSet_nogc_find_func "find(Q&, Func)" but \p cmp is used for key compare. @@ -396,50 +400,9 @@ namespace cds { namespace intrusive { \p cmp 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 find_( val, typename wrapped_ordered_list::template make_compare_from_less(), f ); - } - - /// Find the key \p val - /** \anchor cds_intrusive_SplitListSet_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 find_( val, key_comparator(), f ); - } - - /// Finds the key \p val with \p pred predicate for comparing - /** - The function is an analog of \ref cds_intrusive_SplitListSet_nogc_find_cfunc "find(Q const&, Func)" - but \p cmp is used for key compare. - \p Less has the interface like \p std::less. - \p cmp 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 find_( val, typename wrapped_ordered_list::template make_compare_from_less(), f ); + return find_( key, typename wrapped_ordered_list::template make_compare_from_less(), f ); } /// Checks if the set is empty @@ -462,7 +425,7 @@ namespace cds { namespace intrusive { //@cond template class iterator_type - :public split_list::details::iterator_type + : public split_list::details::iterator_type { typedef split_list::details::iterator_type iterator_base_class; typedef typename iterator_base_class::list_iterator list_iterator; @@ -554,8 +517,10 @@ namespace cds { namespace intrusive { list_iterator it = m_List.insert_at_( pHead, val ); if ( it != m_List.end() ) { inc_item_count(); + m_Stat.onInsertSuccess(); return iterator( it, m_List.end() ); } + m_Stat.onInsertFailed(); return end(); } @@ -570,22 +535,28 @@ namespace cds { namespace intrusive { std::pair ret = m_List.ensure_at_( pHead, val, func ); if ( ret.first != m_List.end() ) { - if ( ret.second ) + if ( ret.second ) { inc_item_count(); + m_Stat.onEnsureNew(); + } + else + m_Stat.onEnsureExist(); return std::make_pair( iterator(ret.first, m_List.end()), ret.second ); } return std::make_pair( end(), ret.second ); } template - iterator find_with_( Q const& val, Less pred ) + iterator find_with_( Q& val, Less pred ) { size_t nHash = hash_value( val ); split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); dummy_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - return iterator( m_List.find_at_( pHead, sv, typename wrapped_ordered_list::template make_compare_from_less() ), m_List.end() ); + auto it = m_List.find_at_( pHead, sv, typename wrapped_ordered_list::template make_compare_from_less() ); + m_Stat.onFind( it != m_List.end() ); + return iterator( it, m_List.end() ); } template @@ -596,8 +567,9 @@ namespace cds { namespace intrusive { dummy_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - return iterator( m_List.find_at_( pHead, sv, key_comparator() ), m_List.end() ); - + auto it = m_List.find_at_( pHead, sv, key_comparator() ); + m_Stat.onFind( it != m_List.end() ); + return iterator( it, m_List.end() ); } template @@ -607,8 +579,8 @@ namespace cds { namespace intrusive { split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); dummy_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - return m_List.find_at( pHead, sv, cmp, - [&f](value_type& item, split_list::details::search_value_type& val){ f(item, val.val ); }); + return m_Stat.onFind( m_List.find_at( pHead, sv, cmp, + [&f](value_type& item, split_list::details::search_value_type& val){ f(item, val.val ); })); } //@endcond diff --git a/cds/intrusive/split_list_rcu.h b/cds/intrusive/split_list_rcu.h index 83e613ad..ecb04bc3 100644 --- a/cds/intrusive/split_list_rcu.h +++ b/cds/intrusive/split_list_rcu.h @@ -27,10 +27,10 @@ namespace cds { namespace intrusive { - \p OrderedList - ordered list implementation used as bucket for hash set, for example, MichaelList, LazyList. The intrusive ordered list implementation specifies the type \p T stored in the hash-set, the comparing functor for the type \p T and other features specific for the ordered list. - - \p Traits - type traits. See split_list::type_traits for explanation. - Instead of defining \p Traits struct you may use option-based syntax with split_list::make_traits metafunction. + - \p Traits - set traits, default isd \p split_list::traits. + Instead of defining \p Traits struct you may use option-based syntax with \p split_list::make_traits metafunction. - @note About features of hash functor needed for \p %SplitList see \ref cds_SplitList_hash_functor "SplitList general description". + @note About reqired features of hash functor see \ref cds_SplitList_hash_functor "SplitList general description". \par How to use Before including you should include appropriate RCU header file, @@ -54,7 +54,7 @@ namespace cds { namespace intrusive { class RCU, class OrderedList, # ifdef CDS_DOXYGEN_INVOKED - class Traits = split_list::type_traits + class Traits = split_list::traits # else class Traits # endif @@ -62,39 +62,40 @@ namespace cds { namespace intrusive { class SplitListSet< cds::urcu::gc< RCU >, OrderedList, Traits > { public: - typedef Traits options ; ///< Traits template parameters - typedef cds::urcu::gc< RCU > gc ; ///< RCU garbage collector + typedef cds::urcu::gc< RCU > gc; ///< RCU garbage collector + typedef Traits traits; ///< Traits template parameters /// 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 cds::opt::v::hash_selector< typename traits::hash >::type hash; protected: //@cond - typedef split_list::details::rebind_list_options wrapped_ordered_list; + typedef split_list::details::rebind_list_traits wrapped_ordered_list; //@endcond public: # ifdef CDS_DOXYGEN_INVOKED - typedef OrderedList ordered_list ; ///< type of ordered list used as base for split-list + typedef OrderedList ordered_list; ///< type of ordered list used as base for split-list # else typedef typename wrapped_ordered_list::result ordered_list; # endif - typedef typename ordered_list::value_type value_type ; ///< type of value stored in the split-list - typedef typename ordered_list::key_comparator key_comparator ; ///< key compare functor - typedef typename ordered_list::disposer disposer ; ///< Node disposer functor - typedef typename ordered_list::rcu_lock rcu_lock ; ///< RCU scoped lock - typedef typename ordered_list::exempt_ptr exempt_ptr ; ///< pointer to extracted node + typedef typename ordered_list::value_type value_type; ///< type of value stored in the split-list + typedef typename ordered_list::key_comparator key_comparator; ///< key compare functor + typedef typename ordered_list::disposer disposer; ///< Node disposer functor + typedef typename ordered_list::rcu_lock rcu_lock; ///< RCU scoped lock + typedef typename ordered_list::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 = ordered_list::c_bExtractLockExternal; - typedef typename options::item_counter item_counter ; ///< Item counter type - typedef typename options::back_off back_off ; ///< back-off strategy for spinning - typedef typename options::memory_model memory_model ; ///< Memory ordering. See cds::opt::memory_model option + typedef typename traits::item_counter item_counter; ///< Item counter type + typedef typename traits::back_off back_off; ///< back-off strategy for spinning + typedef typename traits::memory_model memory_model; ///< Memory ordering. See cds::opt::memory_model option + typedef typename traits::stat stat; ///< Internal statistics protected: - typedef typename ordered_list::node_type list_node_type ; ///< Node type as declared in ordered list - typedef split_list::node node_type ; ///< split-list node type - typedef node_type dummy_node_type ; ///< dummy node type + typedef typename ordered_list::node_type list_node_type; ///< Node type as declared in ordered list + typedef split_list::node node_type; ///< split-list node type + typedef node_type dummy_node_type; ///< dummy node type /// Split-list node traits /** @@ -106,10 +107,10 @@ namespace cds { namespace intrusive { //@cond /// Bucket table implementation typedef typename split_list::details::bucket_table_selector< - options::dynamic_bucket_table + traits::dynamic_bucket_table , gc , dummy_node_type - , opt::allocator< typename options::allocator > + , opt::allocator< typename traits::allocator > , opt::memory_model< memory_model > >::type bucket_table; @@ -233,22 +234,26 @@ namespace cds { namespace intrusive { //@endcond protected: - ordered_list_wrapper m_List ; ///< Ordered list containing split-list items - bucket_table m_Buckets ; ///< bucket table - atomics::atomic m_nBucketCountLog2 ; ///< log2( current bucket count ) - item_counter m_ItemCounter ; ///< Item counter - hash m_HashFunctor ; ///< Hash functor + ordered_list_wrapper m_List; ///< Ordered list containing split-list items + bucket_table m_Buckets; ///< bucket table + atomics::atomic m_nBucketCountLog2; ///< log2( current bucket count ) + item_counter m_ItemCounter; ///< Item counter + hash m_HashFunctor; ///< Hash functor + stat m_Stat; ///< Internal stattistics accumulator protected: //@cond - typedef cds::details::Allocator< dummy_node_type, typename options::allocator > dummy_node_allocator; - static dummy_node_type * alloc_dummy_node( size_t nHash ) + typedef cds::details::Allocator< dummy_node_type, typename traits::allocator > dummy_node_allocator; + + dummy_node_type * alloc_dummy_node( size_t nHash ) { + m_Stat.onHeadNodeAllocated(); return dummy_node_allocator().New( nHash ); } - static void free_dummy_node( dummy_node_type * p ) + void free_dummy_node( dummy_node_type * p ) { dummy_node_allocator().Delete( p ); + m_Stat.onHeadNodeFreed(); } /// Calculates hash value of \p key @@ -277,6 +282,7 @@ namespace cds { namespace intrusive { dummy_node_type * pParentBucket = m_Buckets.bucket( nParent ); if ( pParentBucket == nullptr ) { pParentBucket = init_bucket( nParent ); + m_Stat.onRecursiveInitBucket(); } assert( pParentBucket != nullptr ); @@ -286,6 +292,7 @@ namespace cds { namespace intrusive { dummy_node_type * pBucket = alloc_dummy_node( split_list::dummy_hash( nBucket ) ); if ( m_List.insert_aux_node( pParentBucket, pBucket ) ) { m_Buckets.bucket( nBucket, pBucket ); + m_Stat.onNewBucket(); return pBucket; } free_dummy_node( pBucket ); @@ -297,12 +304,14 @@ namespace cds { namespace intrusive { // The compiler can decide that waiting loop can be "optimized" (stripped) // To prevent this situation, we use waiting on volatile bucket_head_ptr pointer. // + m_Stat.onBucketInitContenton(); back_off bkoff; while ( true ) { dummy_node_type volatile * p = m_Buckets.bucket( nBucket ); if ( p != nullptr ) return const_cast( p ); bkoff(); + m_Stat.onBusyWaitBucketInit(); } } @@ -322,10 +331,11 @@ namespace cds { namespace intrusive { void init() { // 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"); // Initialize bucket 0 dummy_node_type * pNode = alloc_dummy_node( 0 /*split_list::dummy_hash(0)*/ ); @@ -353,8 +363,8 @@ namespace cds { namespace intrusive { dummy_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - return m_List.find_at( pHead, sv, cmp, - [&f](value_type& item, split_list::details::search_value_type& val){ f(item, val.val ); }); + return m_Stat.onFind( m_List.find_at( pHead, sv, cmp, + [&f](value_type& item, split_list::details::search_value_type& val){ f(item, val.val ); })); } template @@ -365,7 +375,7 @@ namespace cds { namespace intrusive { dummy_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - return m_List.find_at( pHead, sv, cmp ); + return m_Stat.onFind( m_List.find_at( pHead, sv, cmp )); } template @@ -376,7 +386,9 @@ namespace cds { namespace intrusive { dummy_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - return m_List.get_at( pHead, sv, cmp ); + value_type * p = m_List.get_at( pHead, sv, cmp ); + m_Stat.onFind( p != nullptr ); + return p; } template @@ -388,8 +400,12 @@ namespace cds { namespace intrusive { assert( pHead != nullptr ); value_type * pNode = m_List.extract_at( pHead, sv, cmp ); - if ( pNode ) + if ( pNode ) { --m_ItemCounter; + m_Stat.onExtractSuccess(); + } + else + m_Stat.onExtractFailed(); return pNode; } @@ -409,8 +425,10 @@ namespace cds { namespace intrusive { if ( m_List.erase_at( pHead, sv, cmp ) ) { --m_ItemCounter; + m_Stat.onEraseSuccess(); return true; } + m_Stat.onEraseFailed(); return false; } @@ -424,8 +442,10 @@ namespace cds { namespace intrusive { if ( m_List.erase_at( pHead, sv, cmp, f )) { --m_ItemCounter; + m_Stat.onEraseSuccess(); return true; } + m_Stat.onEraseFailed(); return false; } @@ -475,8 +495,10 @@ namespace cds { namespace intrusive { if ( m_List.insert_at( pHead, val )) { inc_item_count(); + m_Stat.onInsertSuccess(); return true; } + m_Stat.onInsertFailed(); return false; } @@ -493,13 +515,14 @@ 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 may be passed by reference - using \p std::ref. + where \p val is the item inserted. The function makes RCU lock internally. - */ + + @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 ) { @@ -511,8 +534,10 @@ namespace cds { namespace intrusive { if ( m_List.insert_at( pHead, val, f )) { inc_item_count(); + m_Stat.onInsertSuccess(); return true; } + m_Stat.onInsertFailed(); return false; } @@ -533,17 +558,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 function makes RCU lock internally. 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 ) { @@ -554,8 +578,12 @@ namespace cds { namespace intrusive { node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); std::pair bRet = m_List.ensure_at( pHead, val, func ); - if ( bRet.first && bRet.second ) + if ( bRet.first && bRet.second ) { inc_item_count(); + m_Stat.onEnsureNew(); + } + else + m_Stat.onEnsureExist(); return bRet; } @@ -581,30 +609,32 @@ namespace cds { namespace intrusive { if ( m_List.unlink_at( pHead, val ) ) { --m_ItemCounter; + m_Stat.onEraseSuccess(); return true; } + m_Stat.onEraseFailed(); return false; } /// Deletes the item from the set /** \anchor cds_intrusive_SplitListSet_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. Difference between \ref erase and \p unlink functions: \p erase finds a key and deletes the item found. \p unlink finds an item by key and deletes it - only if \p val is an item of that set, i.e. the pointer to item found - is equal to &val . + only if \p key is an item of that set, i.e. the pointer to item found + is equal to &key . RCU \p synchronize method can be called, therefore, RCU should not be locked. 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 ) { - return erase_( val, key_comparator() ); + return erase_( key, key_comparator() ); } /// Deletes the item from the set using \p pred for searching @@ -615,14 +645,14 @@ 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 ) { - return erase_( val, typename wrapped_ordered_list::template make_compare_from_less() ); + return erase_( key, typename wrapped_ordered_list::template make_compare_from_less() ); } /// Deletes the item from the set /** \anchor cds_intrusive_SplitListSet_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, unlinks it from the set, and returns \p true. The \ref disposer specified by \p OrderedList class template parameter is called by garbage collector \p GC asynchronously. @@ -635,16 +665,16 @@ namespace cds { namespace intrusive { \endcode The functor can 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. RCU \p synchronize method can be called, therefore, RCU should not be locked. 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, Func f ) + bool erase( Q const& key, Func f ) { - return erase_( val, key_comparator(), f ); + return erase_( key, key_comparator(), f ); } /// Deletes the item from the set using \p pred for searching @@ -655,16 +685,16 @@ 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, Func f ) + bool erase_with( Q const& key, Less pred, Func f ) { - return erase_( val, typename wrapped_ordered_list::template make_compare_from_less(), f ); + return erase_( key, typename wrapped_ordered_list::template make_compare_from_less(), f ); } /// Extracts an item from the set /** \anchor cds_intrusive_SplitListSet_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, and returns pointer to an item found in \p dest argument. - If the item with the key equal to \p val is not found the function returns \p false. + If the item with the key equal to \p key is not found the function returns \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 @@ -700,9 +730,9 @@ namespace cds { namespace intrusive { \endcode */ template - bool extract( exempt_ptr& dest, Q const& val ) + bool extract( exempt_ptr& dest, Q const& key ) { - value_type * pNode = extract_( val, key_comparator() ); + value_type * pNode = extract_( key, key_comparator() ); if ( pNode ) { dest = pNode; return true; @@ -718,9 +748,9 @@ 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 ) { - value_type * pNode = extract_with_( val, pred ); + value_type * pNode = extract_with_( key, pred ); if ( pNode ) { dest = pNode; return true; @@ -728,16 +758,16 @@ namespace cds { namespace intrusive { return false; } - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_SplitListSet_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. + where \p item is the item found, \p key is the find function argument. You can pass \p f argument by value or by reference using \p std::ref. @@ -746,7 +776,7 @@ 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 can modify both arguments. Note the hash functor specified for class \p Traits template parameter @@ -754,15 +784,15 @@ namespace cds { namespace intrusive { The function applies RCU lock internally. - 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 find_( val, key_comparator(), f ); + return find_( key, key_comparator(), f ); } - /// Finds the key \p val with \p pred predicate for comparing + /// Finds the key \p key with \p pred predicate for comparing /** The function is an analog of \ref cds_intrusive_SplitListSet_rcu_find_func "find(Q&, Func)" but \p cmp is used for key compare. @@ -770,67 +800,24 @@ namespace cds { namespace intrusive { \p cmp must imply the same element order as the comparator used for building the set. */ template - bool find_with( Q& val, Less pred, Func f ) + bool find_with( Q& key, Less pred, Func f ) { - return find_( val, typename wrapped_ordered_list::template make_compare_from_less(), f ); + return find_( key, typename wrapped_ordered_list::template make_compare_from_less(), f ); } - /// Finds the key \p val - /** \anchor cds_intrusive_SplitListSet_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. 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 applies RCU lock internally. - - The function returns \p true if \p val is found, \p false otherwise. - */ - template - bool find( Q const& val, Func f ) - { - return find_( val, key_comparator(), f ); - } - - /// Finds the key \p val with \p pred predicate for comparing - /** - The function is an analog of \ref cds_intrusive_SplitListSet_rcu_find_cfunc "find(Q const&, Func)" - but \p cmp is used for key compare. - \p Less 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 ) - { - return find_( val, typename wrapped_ordered_list::template make_compare_from_less(), f ); - } - - /// Finds the key \p val + /// Finds the key \p key /** \anchor cds_intrusive_SplitListSet_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 ) + bool find( Q const& key ) { - return find_value( val, key_comparator() ); + return find_value( key, key_comparator() ); } - /// Finds the key \p val with \p pred predicate for comparing + /// Finds the key \p key with \p pred predicate for comparing /** The function is an analog of \ref cds_intrusive_SplitListSet_rcu_find_val "find(Q const&)" but \p cmp is used for key compare. @@ -838,15 +825,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 const& val, Less pred ) + bool find_with( Q const& key, Less pred ) { - return find_value( val, typename wrapped_ordered_list::template make_compare_from_less() ); + return find_value( key, typename wrapped_ordered_list::template make_compare_from_less() ); } - /// Finds the key \p val and return the item found + /// Finds the key \p key and return the item found /** \anchor cds_intrusive_SplitListSet_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. @@ -870,12 +857,12 @@ namespace cds { namespace intrusive { \endcode */ template - value_type * get( Q const& val ) + value_type * get( Q const& key ) { - return get_( val, key_comparator() ); + return get_( key, key_comparator() ); } - /// 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_SplitListSet_rcu_get "get(Q const&)" but \p pred is used for comparing the keys. @@ -885,9 +872,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 ) + value_type * get_with( Q const& key, Less pred ) { - return get_( val, typename wrapped_ordered_list::template make_compare_from_less()); + return get_( key, typename wrapped_ordered_list::template make_compare_from_less()); } @@ -907,11 +894,7 @@ namespace cds { namespace intrusive { return size() == 0; } - /// Clears the set (non-atomic) - /** - The function unlink all items from the set. - The function is not atomic. Therefore, \p clear may be used only for debugging purposes. - */ + /// Clears the set (not atomic) void clear() { iterator it = begin(); diff --git a/tests/test-hdr/set/hdr_intrusive_set.h b/tests/test-hdr/set/hdr_intrusive_set.h index 728cb002..8e087d5d 100644 --- a/tests/test-hdr/set/hdr_intrusive_set.h +++ b/tests/test-hdr/set/hdr_intrusive_set.h @@ -1168,28 +1168,36 @@ namespace set { void split_dyn_HP_base_cmp(); void split_dyn_HP_base_less(); void split_dyn_HP_base_cmpmix(); + void split_dyn_HP_base_cmpmix_stat(); void split_dyn_HP_member_cmp(); void split_dyn_HP_member_less(); void split_dyn_HP_member_cmpmix(); + void split_dyn_HP_member_cmpmix_stat(); void split_st_HP_base_cmp(); void split_st_HP_base_less(); void split_st_HP_base_cmpmix(); + void split_st_HP_base_cmpmix_stat(); void split_st_HP_member_cmp(); void split_st_HP_member_less(); void split_st_HP_member_cmpmix(); + void split_st_HP_member_cmpmix_stat(); void split_dyn_DHP_base_cmp(); void split_dyn_DHP_base_less(); void split_dyn_DHP_base_cmpmix(); + void split_dyn_DHP_base_cmpmix_stat(); void split_dyn_DHP_member_cmp(); void split_dyn_DHP_member_less(); void split_dyn_DHP_member_cmpmix(); + void split_dyn_DHP_member_cmpmix_stat(); void split_st_DHP_base_cmp(); void split_st_DHP_base_less(); void split_st_DHP_base_cmpmix(); + void split_st_DHP_base_cmpmix_stat(); void split_st_DHP_member_cmp(); void split_st_DHP_member_less(); void split_st_DHP_member_cmpmix(); + void split_st_DHP_member_cmpmix_stat(); void split_dyn_RCU_GPI_base_cmp(); void split_dyn_RCU_GPI_base_less(); @@ -1207,15 +1215,19 @@ namespace set { void split_dyn_RCU_GPB_base_cmp(); void split_dyn_RCU_GPB_base_less(); void split_dyn_RCU_GPB_base_cmpmix(); + void split_dyn_RCU_GPB_base_cmpmix_stat(); void split_dyn_RCU_GPB_member_cmp(); void split_dyn_RCU_GPB_member_less(); void split_dyn_RCU_GPB_member_cmpmix(); + void split_dyn_RCU_GPB_member_cmpmix_stat(); void split_st_RCU_GPB_base_cmp(); void split_st_RCU_GPB_base_less(); void split_st_RCU_GPB_base_cmpmix(); + void split_st_RCU_GPB_base_cmpmix_stat(); void split_st_RCU_GPB_member_cmp(); void split_st_RCU_GPB_member_less(); void split_st_RCU_GPB_member_cmpmix(); + void split_st_RCU_GPB_member_cmpmix_stat(); void split_dyn_RCU_GPT_base_cmp(); void split_dyn_RCU_GPT_base_less(); @@ -1259,43 +1271,55 @@ namespace set { void split_dyn_nogc_base_cmp(); void split_dyn_nogc_base_less(); void split_dyn_nogc_base_cmpmix(); + void split_dyn_nogc_base_cmpmix_stat(); void split_dyn_nogc_member_cmp(); void split_dyn_nogc_member_less(); void split_dyn_nogc_member_cmpmix(); + void split_dyn_nogc_member_cmpmix_stat(); void split_st_nogc_base_cmp(); void split_st_nogc_base_less(); void split_st_nogc_base_cmpmix(); + void split_st_nogc_base_cmpmix_stat(); void split_st_nogc_member_cmp(); void split_st_nogc_member_less(); void split_st_nogc_member_cmpmix(); + void split_st_nogc_member_cmpmix_stat(); // SplitListSet + LazyList [dyn - dynamic bucket table, st - static bucket table] void split_dyn_HP_base_cmp_lazy(); void split_dyn_HP_base_less_lazy(); void split_dyn_HP_base_cmpmix_lazy(); + void split_dyn_HP_base_cmpmix_stat_lazy(); void split_dyn_HP_member_cmp_lazy(); void split_dyn_HP_member_less_lazy(); void split_dyn_HP_member_cmpmix_lazy(); + void split_dyn_HP_member_cmpmix_stat_lazy(); void split_st_HP_base_cmp_lazy(); void split_st_HP_base_less_lazy(); void split_st_HP_base_cmpmix_lazy(); + void split_st_HP_base_cmpmix_stat_lazy(); void split_st_HP_member_cmp_lazy(); void split_st_HP_member_less_lazy(); void split_st_HP_member_cmpmix_lazy(); + void split_st_HP_member_cmpmix_stat_lazy(); void split_dyn_DHP_base_cmp_lazy(); void split_dyn_DHP_base_less_lazy(); void split_dyn_DHP_base_cmpmix_lazy(); + void split_dyn_DHP_base_cmpmix_stat_lazy(); void split_dyn_DHP_member_cmp_lazy(); void split_dyn_DHP_member_less_lazy(); void split_dyn_DHP_member_cmpmix_lazy(); + void split_dyn_DHP_member_cmpmix_stat_lazy(); void split_st_DHP_base_cmp_lazy(); void split_st_DHP_base_less_lazy(); void split_st_DHP_base_cmpmix_lazy(); + void split_st_DHP_base_cmpmix_stat_lazy(); void split_st_DHP_member_cmp_lazy(); void split_st_DHP_member_less_lazy(); void split_st_DHP_member_cmpmix_lazy(); + void split_st_DHP_member_cmpmix_stat_lazy(); void split_dyn_RCU_GPI_base_cmp_lazy(); void split_dyn_RCU_GPI_base_less_lazy(); @@ -1313,15 +1337,19 @@ namespace set { void split_dyn_RCU_GPB_base_cmp_lazy(); void split_dyn_RCU_GPB_base_less_lazy(); void split_dyn_RCU_GPB_base_cmpmix_lazy(); + void split_dyn_RCU_GPB_base_cmpmix_stat_lazy(); void split_dyn_RCU_GPB_member_cmp_lazy(); void split_dyn_RCU_GPB_member_less_lazy(); void split_dyn_RCU_GPB_member_cmpmix_lazy(); + void split_dyn_RCU_GPB_member_cmpmix_stat_lazy(); void split_st_RCU_GPB_base_cmp_lazy(); void split_st_RCU_GPB_base_less_lazy(); void split_st_RCU_GPB_base_cmpmix_lazy(); + void split_st_RCU_GPB_base_cmpmix_stat_lazy(); void split_st_RCU_GPB_member_cmp_lazy(); void split_st_RCU_GPB_member_less_lazy(); void split_st_RCU_GPB_member_cmpmix_lazy(); + void split_st_RCU_GPB_member_cmpmix_stat_lazy(); void split_dyn_RCU_GPT_base_cmp_lazy(); void split_dyn_RCU_GPT_base_less_lazy(); @@ -1365,15 +1393,19 @@ namespace set { void split_dyn_nogc_base_cmp_lazy(); void split_dyn_nogc_base_less_lazy(); void split_dyn_nogc_base_cmpmix_lazy(); + void split_dyn_nogc_base_cmpmix_stat_lazy(); void split_dyn_nogc_member_cmp_lazy(); void split_dyn_nogc_member_less_lazy(); void split_dyn_nogc_member_cmpmix_lazy(); + void split_dyn_nogc_member_cmpmix_stat_lazy(); void split_st_nogc_base_cmp_lazy(); void split_st_nogc_base_less_lazy(); void split_st_nogc_base_cmpmix_lazy(); + void split_st_nogc_base_cmpmix_stat_lazy(); void split_st_nogc_member_cmp_lazy(); void split_st_nogc_member_less_lazy(); void split_st_nogc_member_cmpmix_lazy(); + void split_st_nogc_member_cmpmix_stat_lazy(); CPPUNIT_TEST_SUITE(IntrusiveHashSetHdrTest) CPPUNIT_TEST(HP_base_cmp) @@ -1491,28 +1523,36 @@ namespace set { CPPUNIT_TEST(split_dyn_HP_base_cmp) CPPUNIT_TEST(split_dyn_HP_base_less) CPPUNIT_TEST(split_dyn_HP_base_cmpmix) - CPPUNIT_TEST(split_dyn_HP_member_cmp) + CPPUNIT_TEST( split_dyn_HP_base_cmpmix_stat ) + CPPUNIT_TEST( split_dyn_HP_member_cmp ) CPPUNIT_TEST(split_dyn_HP_member_less) CPPUNIT_TEST(split_dyn_HP_member_cmpmix) - CPPUNIT_TEST(split_st_HP_base_cmp) + CPPUNIT_TEST( split_dyn_HP_member_cmpmix_stat ) + CPPUNIT_TEST( split_st_HP_base_cmp ) CPPUNIT_TEST(split_st_HP_base_less) CPPUNIT_TEST(split_st_HP_base_cmpmix) - CPPUNIT_TEST(split_st_HP_member_cmp) + CPPUNIT_TEST( split_st_HP_base_cmpmix_stat ) + CPPUNIT_TEST( split_st_HP_member_cmp ) CPPUNIT_TEST(split_st_HP_member_less) CPPUNIT_TEST(split_st_HP_member_cmpmix) + CPPUNIT_TEST( split_st_HP_member_cmpmix_stat ) CPPUNIT_TEST(split_dyn_DHP_base_cmp) CPPUNIT_TEST(split_dyn_DHP_base_less) CPPUNIT_TEST(split_dyn_DHP_base_cmpmix) - CPPUNIT_TEST(split_dyn_DHP_member_cmp) + CPPUNIT_TEST( split_dyn_DHP_base_cmpmix_stat ) + CPPUNIT_TEST( split_dyn_DHP_member_cmp ) CPPUNIT_TEST(split_dyn_DHP_member_less) CPPUNIT_TEST(split_dyn_DHP_member_cmpmix) - CPPUNIT_TEST(split_st_DHP_base_cmp) + CPPUNIT_TEST( split_dyn_DHP_member_cmpmix_stat ) + CPPUNIT_TEST( split_st_DHP_base_cmp ) CPPUNIT_TEST(split_st_DHP_base_less) CPPUNIT_TEST(split_st_DHP_base_cmpmix) - CPPUNIT_TEST(split_st_DHP_member_cmp) + CPPUNIT_TEST( split_st_DHP_base_cmpmix_stat ) + CPPUNIT_TEST( split_st_DHP_member_cmp ) CPPUNIT_TEST(split_st_DHP_member_less) CPPUNIT_TEST(split_st_DHP_member_cmpmix) + CPPUNIT_TEST( split_st_DHP_member_cmpmix_stat ) CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmp) CPPUNIT_TEST(split_dyn_RCU_GPI_base_less) @@ -1530,15 +1570,19 @@ namespace set { CPPUNIT_TEST(split_dyn_RCU_GPB_base_cmp) CPPUNIT_TEST(split_dyn_RCU_GPB_base_less) CPPUNIT_TEST(split_dyn_RCU_GPB_base_cmpmix) - CPPUNIT_TEST(split_dyn_RCU_GPB_member_cmp) + CPPUNIT_TEST( split_dyn_RCU_GPB_base_cmpmix_stat ) + CPPUNIT_TEST( split_dyn_RCU_GPB_member_cmp ) CPPUNIT_TEST(split_dyn_RCU_GPB_member_less) CPPUNIT_TEST(split_dyn_RCU_GPB_member_cmpmix) - CPPUNIT_TEST(split_st_RCU_GPB_base_cmp) + CPPUNIT_TEST( split_dyn_RCU_GPB_member_cmpmix_stat ) + CPPUNIT_TEST( split_st_RCU_GPB_base_cmp ) CPPUNIT_TEST(split_st_RCU_GPB_base_less) CPPUNIT_TEST(split_st_RCU_GPB_base_cmpmix) - CPPUNIT_TEST(split_st_RCU_GPB_member_cmp) + CPPUNIT_TEST( split_st_RCU_GPB_base_cmpmix_stat ) + CPPUNIT_TEST( split_st_RCU_GPB_member_cmp ) CPPUNIT_TEST(split_st_RCU_GPB_member_less) CPPUNIT_TEST(split_st_RCU_GPB_member_cmpmix) + CPPUNIT_TEST( split_st_RCU_GPB_member_cmpmix_stat ) CPPUNIT_TEST(split_dyn_RCU_GPT_base_cmp) CPPUNIT_TEST(split_dyn_RCU_GPT_base_less) @@ -1582,42 +1626,53 @@ namespace set { CPPUNIT_TEST(split_dyn_nogc_base_cmp) CPPUNIT_TEST(split_dyn_nogc_base_less) CPPUNIT_TEST(split_dyn_nogc_base_cmpmix) - CPPUNIT_TEST(split_dyn_nogc_member_cmp) + CPPUNIT_TEST( split_dyn_nogc_base_cmpmix_stat ) + CPPUNIT_TEST( split_dyn_nogc_member_cmp ) CPPUNIT_TEST(split_dyn_nogc_member_less) CPPUNIT_TEST(split_dyn_nogc_member_cmpmix) - CPPUNIT_TEST(split_st_nogc_base_cmp) + CPPUNIT_TEST( split_dyn_nogc_member_cmpmix_stat ) + CPPUNIT_TEST( split_st_nogc_base_cmp ) CPPUNIT_TEST(split_st_nogc_base_less) CPPUNIT_TEST(split_st_nogc_base_cmpmix) - CPPUNIT_TEST(split_st_nogc_member_cmp) + CPPUNIT_TEST( split_st_nogc_base_cmpmix_stat ) + CPPUNIT_TEST( split_st_nogc_member_cmp ) CPPUNIT_TEST(split_st_nogc_member_less) CPPUNIT_TEST(split_st_nogc_member_cmpmix) - + CPPUNIT_TEST( split_st_nogc_member_cmpmix_stat ) CPPUNIT_TEST(split_dyn_HP_base_cmp_lazy) CPPUNIT_TEST(split_dyn_HP_base_less_lazy) CPPUNIT_TEST(split_dyn_HP_base_cmpmix_lazy) - CPPUNIT_TEST(split_dyn_HP_member_cmp_lazy) + CPPUNIT_TEST( split_dyn_HP_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_dyn_HP_member_cmp_lazy ) CPPUNIT_TEST(split_dyn_HP_member_less_lazy) CPPUNIT_TEST(split_dyn_HP_member_cmpmix_lazy) - CPPUNIT_TEST(split_st_HP_base_cmp_lazy) + CPPUNIT_TEST( split_dyn_HP_member_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_HP_base_cmp_lazy ) CPPUNIT_TEST(split_st_HP_base_less_lazy) CPPUNIT_TEST(split_st_HP_base_cmpmix_lazy) - CPPUNIT_TEST(split_st_HP_member_cmp_lazy) + CPPUNIT_TEST( split_st_HP_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_HP_member_cmp_lazy ) CPPUNIT_TEST(split_st_HP_member_less_lazy) CPPUNIT_TEST(split_st_HP_member_cmpmix_lazy) + CPPUNIT_TEST( split_st_HP_member_cmpmix_stat_lazy ) CPPUNIT_TEST(split_dyn_DHP_base_cmp_lazy) CPPUNIT_TEST(split_dyn_DHP_base_less_lazy) CPPUNIT_TEST(split_dyn_DHP_base_cmpmix_lazy) - CPPUNIT_TEST(split_dyn_DHP_member_cmp_lazy) + CPPUNIT_TEST( split_dyn_DHP_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_dyn_DHP_member_cmp_lazy ) CPPUNIT_TEST(split_dyn_DHP_member_less_lazy) CPPUNIT_TEST(split_dyn_DHP_member_cmpmix_lazy) - CPPUNIT_TEST(split_st_DHP_base_cmp_lazy) + CPPUNIT_TEST( split_dyn_DHP_member_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_DHP_base_cmp_lazy ) CPPUNIT_TEST(split_st_DHP_base_less_lazy) CPPUNIT_TEST(split_st_DHP_base_cmpmix_lazy) - CPPUNIT_TEST(split_st_DHP_member_cmp_lazy) + CPPUNIT_TEST( split_st_DHP_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_DHP_member_cmp_lazy ) CPPUNIT_TEST(split_st_DHP_member_less_lazy) CPPUNIT_TEST(split_st_DHP_member_cmpmix_lazy) + CPPUNIT_TEST( split_st_DHP_member_cmpmix_stat_lazy ) CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmp_lazy) CPPUNIT_TEST(split_dyn_RCU_GPI_base_less_lazy) @@ -1635,15 +1690,19 @@ namespace set { CPPUNIT_TEST(split_dyn_RCU_GPB_base_cmp_lazy) CPPUNIT_TEST(split_dyn_RCU_GPB_base_less_lazy) CPPUNIT_TEST(split_dyn_RCU_GPB_base_cmpmix_lazy) - CPPUNIT_TEST(split_dyn_RCU_GPB_member_cmp_lazy) + CPPUNIT_TEST( split_dyn_RCU_GPB_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_dyn_RCU_GPB_member_cmp_lazy ) CPPUNIT_TEST(split_dyn_RCU_GPB_member_less_lazy) CPPUNIT_TEST(split_dyn_RCU_GPB_member_cmpmix_lazy) - CPPUNIT_TEST(split_st_RCU_GPB_base_cmp_lazy) + CPPUNIT_TEST( split_dyn_RCU_GPB_member_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_RCU_GPB_base_cmp_lazy ) CPPUNIT_TEST(split_st_RCU_GPB_base_less_lazy) CPPUNIT_TEST(split_st_RCU_GPB_base_cmpmix_lazy) - CPPUNIT_TEST(split_st_RCU_GPB_member_cmp_lazy) + CPPUNIT_TEST( split_st_RCU_GPB_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_RCU_GPB_member_cmp_lazy ) CPPUNIT_TEST(split_st_RCU_GPB_member_less_lazy) CPPUNIT_TEST(split_st_RCU_GPB_member_cmpmix_lazy) + CPPUNIT_TEST( split_st_RCU_GPB_member_cmpmix_stat_lazy ) CPPUNIT_TEST(split_dyn_RCU_GPT_base_cmp_lazy) CPPUNIT_TEST(split_dyn_RCU_GPT_base_less_lazy) @@ -1687,15 +1746,19 @@ namespace set { CPPUNIT_TEST(split_dyn_nogc_base_cmp_lazy) CPPUNIT_TEST(split_dyn_nogc_base_less_lazy) CPPUNIT_TEST(split_dyn_nogc_base_cmpmix_lazy) - CPPUNIT_TEST(split_dyn_nogc_member_cmp_lazy) + CPPUNIT_TEST( split_dyn_nogc_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_dyn_nogc_member_cmp_lazy ) CPPUNIT_TEST(split_dyn_nogc_member_less_lazy) CPPUNIT_TEST(split_dyn_nogc_member_cmpmix_lazy) - CPPUNIT_TEST(split_st_nogc_base_cmp_lazy) + CPPUNIT_TEST( split_dyn_nogc_member_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_nogc_base_cmp_lazy ) CPPUNIT_TEST(split_st_nogc_base_less_lazy) CPPUNIT_TEST(split_st_nogc_base_cmpmix_lazy) - CPPUNIT_TEST(split_st_nogc_member_cmp_lazy) + CPPUNIT_TEST( split_st_nogc_base_cmpmix_stat_lazy ) + CPPUNIT_TEST( split_st_nogc_member_cmp_lazy ) CPPUNIT_TEST(split_st_nogc_member_less_lazy) CPPUNIT_TEST(split_st_nogc_member_cmpmix_lazy) + CPPUNIT_TEST( split_st_nogc_member_cmpmix_stat_lazy ) CPPUNIT_TEST_SUITE_END() diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp index a4a368c2..330d39bb 100644 --- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp +++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp @@ -78,6 +78,32 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_dyn_DHP_base_cmpmix_stat() + { + typedef base_int_item< ci::split_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 > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::DHP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } + void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmp() { typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; @@ -157,6 +183,30 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmpmix_stat() + { + typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; + struct list_traits : public ci::michael_list::traits + { + typedef ci::michael_list::member_hook< offsetof( item, hMember ), co::gc > hook; + typedef cmp compare; + typedef IntrusiveHashSetHdrTest::less less; + typedef faked_disposer disposer; + }; + typedef ci::MichaelList< cds::gc::DHP, item, list_traits > ord_list; + + struct set_traits : public ci::split_list::traits { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef co::v::sequential_consistent memory_model; + typedef ci::split_list::stat<> stat; + }; + typedef ci::SplitListSet< cds::gc::DHP, ord_list, set_traits > set; + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } + // Static bucket table void IntrusiveHashSetHdrTest::split_st_DHP_base_cmp() @@ -232,6 +282,33 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_st_DHP_base_cmpmix_stat() + { + typedef base_int_item< ci::split_list::node > > item; + struct list_traits : + public 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 + {}; + typedef ci::MichaelList< cds::gc::DHP, item, list_traits > ord_list; + + struct set_traits : + public ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + {}; + typedef ci::SplitListSet< cds::gc::DHP, ord_list, set_traits > set; + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } + void IntrusiveHashSetHdrTest::split_st_DHP_member_cmp() { typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; @@ -314,5 +391,34 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_st_DHP_member_cmpmix_stat() + { + typedef member_int_item< ci::split_list::node< 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::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::DHP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } + } // namespace set diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp index e0ad4485..c3c74382 100644 --- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp +++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp @@ -78,6 +78,32 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_dyn_DHP_base_cmpmix_stat_lazy() + { + typedef base_int_item< ci::split_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 > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::DHP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } + void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmp_lazy() { typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; @@ -157,6 +183,29 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmpmix_stat_lazy() + { + typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; + struct list_traits : public ci::lazy_list::traits + { + typedef ci::lazy_list::member_hook< offsetof( item, hMember ), co::gc> hook; + typedef cmp compare; + typedef IntrusiveHashSetHdrTest::less less; + typedef faked_disposer disposer; + }; + typedef ci::LazyList< cds::gc::DHP, item, list_traits > ord_list; + + struct set_traits : public ci::split_list::traits { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + }; + typedef ci::SplitListSet< cds::gc::DHP, ord_list, set_traits > set; + + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } // Static bucket table void IntrusiveHashSetHdrTest::split_st_DHP_base_cmp_lazy() @@ -232,6 +281,32 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_st_DHP_base_cmpmix_stat_lazy() + { + typedef base_int_item< ci::split_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 > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::DHP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } + void IntrusiveHashSetHdrTest::split_st_DHP_member_cmp_lazy() { typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; @@ -314,5 +389,33 @@ namespace set { test_int(); } + void IntrusiveHashSetHdrTest::split_st_DHP_member_cmpmix_stat_lazy() + { + typedef member_int_item< ci::split_list::node< 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::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::DHP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } } // namespace set diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp.cpp index b859a4be..161199b1 100644 --- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp.cpp +++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp.cpp @@ -25,7 +25,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -48,7 +48,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -73,7 +73,33 @@ namespace set { ,ci::split_list::dynamic_bucket_table >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } + + void IntrusiveHashSetHdrTest::split_dyn_HP_base_cmpmix_stat() + { + typedef base_int_item< ci::split_list::node > > item; + typedef ci::MichaelList< cds::gc::HP + ,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 + > ord_list; + + typedef ci::SplitListSet< cds::gc::HP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -99,7 +125,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -125,7 +151,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -150,13 +176,36 @@ namespace set { ci::split_list::make_traits< co::hash< hash_int > ,co::item_counter< simple_item_counter > + , ci::split_list::dynamic_bucket_table >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } + void IntrusiveHashSetHdrTest::split_dyn_HP_member_cmpmix_stat() + { + typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; + struct list_traits : public ci::michael_list::traits { + typedef ci::michael_list::member_hook< offsetof( item, hMember ), co::gc> hook; + typedef cmp compare; + typedef IntrusiveHashSetHdrTest::less less; + typedef faked_disposer disposer; + }; + typedef ci::MichaelList< cds::gc::HP, item, list_traits > ord_list; + + struct set_traits : public ci::split_list::traits { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + }; + typedef ci::SplitListSet< cds::gc::HP, ord_list, set_traits > set; + + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } // Static bucket table void IntrusiveHashSetHdrTest::split_st_HP_base_cmp() @@ -178,7 +227,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -202,7 +251,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -227,7 +276,35 @@ namespace set { ,ci::split_list::dynamic_bucket_table >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } + + void IntrusiveHashSetHdrTest::split_st_HP_base_cmpmix_stat() + { + typedef base_int_item< ci::split_list::node > > item; + struct list_traits : + public 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 + {}; + typedef ci::MichaelList< cds::gc::HP, item, list_traits > ord_list; + + struct set_traits : + public ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + {}; + typedef ci::SplitListSet< cds::gc::HP, ord_list, set_traits > set; + + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -254,7 +331,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -281,7 +358,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -309,10 +386,38 @@ namespace set { ,ci::split_list::dynamic_bucket_table >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } + void IntrusiveHashSetHdrTest::split_st_HP_member_cmpmix_stat() + { + typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; + typedef ci::MichaelList< cds::gc::HP + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::HP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } } // namespace set diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp_lazy.cpp index 477f4a9a..a43baeac 100644 --- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp_lazy.cpp +++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_hp_lazy.cpp @@ -26,7 +26,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -49,7 +49,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -74,7 +74,33 @@ namespace set { ,ci::split_list::dynamic_bucket_table >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } + + void IntrusiveHashSetHdrTest::split_dyn_HP_base_cmpmix_stat_lazy() + { + typedef base_int_item< ci::split_list::node > > item; + typedef ci::LazyList< cds::gc::HP + ,item + ,ci::lazy_list::make_traits< + ci::opt::hook< ci::lazy_list::base_hook< co::gc > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::HP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -100,7 +126,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -126,7 +152,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -153,7 +179,32 @@ namespace set { ,co::item_counter< simple_item_counter > >::type > set; - static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" ); + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); + + test_int(); + } + + void IntrusiveHashSetHdrTest::split_dyn_HP_member_cmpmix_stat_lazy() + { + typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; + struct list_traits : public ci::lazy_list::traits + { + typedef ci::lazy_list::member_hook< offsetof( item, hMember ), co::gc> hook; + typedef cmp compare; + typedef IntrusiveHashSetHdrTest::less less; + typedef faked_disposer disposer; + }; + typedef ci::LazyList< cds::gc::HP, item, list_traits > ord_list; + + struct set_traits : public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + }; + typedef ci::SplitListSet< cds::gc::HP, ord_list, set_traits > set; + + static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" ); test_int(); } @@ -179,7 +230,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -203,7 +254,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -228,7 +279,36 @@ namespace set { ,ci::split_list::dynamic_bucket_table >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } + + void IntrusiveHashSetHdrTest::split_st_HP_base_cmpmix_stat_lazy() + { + typedef base_int_item< ci::split_list::node > > item; + struct list_traits : + public ci::lazy_list::make_traits< + ci::opt::hook< ci::lazy_list::base_hook< co::gc > > + ,co::less< less > + ,co::compare< cmp > + ,ci::opt::disposer< faked_disposer > + >::type + {}; + typedef ci::LazyList< cds::gc::HP, item, list_traits > ord_list; + + struct set_traits : + public ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + >::type + { + typedef ci::split_list::stat<> stat; + }; + typedef ci::SplitListSet< cds::gc::HP, ord_list, set_traits > set; + + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -255,7 +335,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -282,7 +362,7 @@ namespace set { ,co::memory_model >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } @@ -310,10 +390,39 @@ namespace set { ,ci::split_list::dynamic_bucket_table >::type > set; - static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" ); + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); test_int(); } + void IntrusiveHashSetHdrTest::split_st_HP_member_cmpmix_stat_lazy() + { + typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; + typedef ci::LazyList< cds::gc::HP + ,item + ,ci::lazy_list::make_traits< + ci::opt::hook< ci::lazy_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > ord_list; + + typedef ci::SplitListSet< cds::gc::HP, ord_list, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + + static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" ); + + test_int(); + } } // namespace set diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc.cpp index 95e4b5a3..7601d228 100644 --- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc.cpp +++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc.cpp @@ -76,6 +76,29 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_dyn_nogc_base_cmpmix_stat() + { + typedef base_int_item< ci::split_list::node< ci::michael_list::node > > item; + struct list_traits : public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< co::gc > hook; + typedef cmp compare; + typedef IntrusiveHashSetHdrTest::less less; + typedef faked_disposer disposer; + }; + typedef ci::MichaelList< cds::gc::nogc, item, list_traits > bucket_type; + + struct set_traits : public ci::split_list::make_traits< ci::split_list::dynamic_bucket_table >::type + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + }; + typedef ci::SplitListSet< cds::gc::nogc, bucket_type, set_traits > set; + + test_int_nogc(); + } + void IntrusiveHashSetHdrTest::split_dyn_nogc_member_cmp() { typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; @@ -155,6 +178,34 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_dyn_nogc_member_cmpmix_stat() + { + typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; + struct list_traits: + public ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + {}; + typedef ci::MichaelList< cds::gc::nogc, item, list_traits > bucket_type; + + struct set_traits : + public ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + {}; + typedef ci::SplitListSet< cds::gc::nogc, bucket_type, set_traits > set; + + test_int_nogc(); + } // Static bucket table void IntrusiveHashSetHdrTest::split_st_nogc_base_cmp() @@ -227,6 +278,31 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_st_nogc_base_cmpmix_stat() + { + typedef base_int_item< ci::split_list::node< ci::michael_list::node > > item; + typedef ci::MichaelList< cds::gc::nogc + ,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 + > bucket_type; + + typedef ci::SplitListSet< cds::gc::nogc, bucket_type, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + + test_int_nogc(); + } + void IntrusiveHashSetHdrTest::split_st_nogc_member_cmp() { typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; @@ -306,4 +382,32 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_st_nogc_member_cmpmix_stat() + { + typedef member_int_item< ci::split_list::node< ci::michael_list::node > > item; + typedef ci::MichaelList< cds::gc::nogc + ,item + ,ci::michael_list::make_traits< + ci::opt::hook< ci::michael_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > bucket_type; + + typedef ci::SplitListSet< cds::gc::nogc, bucket_type, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + + test_int_nogc(); + } + } // namespace set diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc_lazy.cpp index 4a80ab85..dd26b8a2 100644 --- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc_lazy.cpp +++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_nogc_lazy.cpp @@ -77,6 +77,29 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_dyn_nogc_base_cmpmix_stat_lazy() + { + typedef base_int_item< ci::split_list::node< ci::lazy_list::node > > item; + struct list_traits : public ci::lazy_list::traits + { + typedef ci::lazy_list::base_hook< co::gc > hook; + typedef IntrusiveHashSetHdrTest::less less; + typedef cmp compare; + typedef faked_disposer disposer; + }; + typedef ci::LazyList< cds::gc::nogc, item, list_traits > bucket_type; + + struct set_traits : public ci::split_list::make_traits>::type + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + }; + typedef ci::SplitListSet< cds::gc::nogc, bucket_type, set_traits > set; + + test_int_nogc(); + } + void IntrusiveHashSetHdrTest::split_dyn_nogc_member_cmp_lazy() { typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; @@ -156,6 +179,34 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_dyn_nogc_member_cmpmix_stat_lazy() + { + typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; + struct list_traits : + public ci::lazy_list::make_traits< + ci::opt::hook< ci::lazy_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + {}; + typedef ci::LazyList< cds::gc::nogc, item, list_traits > bucket_type; + + struct set_traits : + public ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + {}; + typedef ci::SplitListSet< cds::gc::nogc, bucket_type, set_traits > set; + + test_int_nogc(); + } // Static bucket table void IntrusiveHashSetHdrTest::split_st_nogc_base_cmp_lazy() @@ -228,6 +279,31 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_st_nogc_base_cmpmix_stat_lazy() + { + typedef base_int_item< ci::split_list::node< ci::lazy_list::node > > item; + typedef ci::LazyList< cds::gc::nogc + ,item + ,ci::lazy_list::make_traits< + 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::SplitListSet< cds::gc::nogc, bucket_type, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + + test_int_nogc(); + } + void IntrusiveHashSetHdrTest::split_st_nogc_member_cmp_lazy() { typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; @@ -307,4 +383,32 @@ namespace set { test_int_nogc(); } + void IntrusiveHashSetHdrTest::split_st_nogc_member_cmpmix_stat_lazy() + { + typedef member_int_item< ci::split_list::node< ci::lazy_list::node > > item; + typedef ci::LazyList< cds::gc::nogc + ,item + ,ci::lazy_list::make_traits< + ci::opt::hook< ci::lazy_list::member_hook< + offsetof( item, hMember ), + co::gc + > > + ,co::compare< cmp > + ,co::less< less > + ,ci::opt::disposer< faked_disposer > + >::type + > bucket_type; + + typedef ci::SplitListSet< cds::gc::nogc, bucket_type, + ci::split_list::make_traits< + co::hash< hash_int > + ,co::item_counter< simple_item_counter > + ,ci::split_list::dynamic_bucket_table + ,co::stat< ci::split_list::stat<> > + >::type + > set; + + test_int_nogc(); + } + } // namespace set -- 2.34.1