From: khizmax Date: Fri, 7 Nov 2014 13:01:21 +0000 (+0300) Subject: EllenBinTreeSet refactoring X-Git-Tag: v2.0.0~128 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=c6e967b5f36e600a1b9058191348830b3ec9d1eb EllenBinTreeSet refactoring --- diff --git a/cds/container/details/ellen_bintree_base.h b/cds/container/details/ellen_bintree_base.h index ca6d7908..f8e11fd6 100644 --- a/cds/container/details/ellen_bintree_base.h +++ b/cds/container/details/ellen_bintree_base.h @@ -16,32 +16,30 @@ namespace cds { namespace container { namespace ellen_bintree { #ifdef CDS_DOXYGEN_INVOKED - /// Typedef for cds::intrusive::ellen_bintree::update_desc + /// Typedef for \p cds::intrusive::ellen_bintree::update_desc typedef cds::intrusive::ellen_bintree::update_desc update_desc; - /// Typedef for cds::intrusive::ellen_bintree::internal_node + /// Typedef for \p cds::intrusive::ellen_bintree::internal_node typedef cds::intrusive::ellen_bintree::internal_node internal_node; - /// Typedef for cds::intrusive::ellen_bintree::key_extractor + /// Typedef for \p cds::intrusive::ellen_bintree::key_extractor typedef cds::intrusive::ellen_bintree::key_extractor key_extractor; - /// Typedef for cds::intrusive::ellen_bintree::update_desc_allocator + /// Typedef for \p cds::intrusive::ellen_bintree::update_desc_allocator typedef cds::intrusive::ellen_bintree::update_desc_allocator update_desc_allocator; - - /// Typedef for cds::intrusive::ellen_bintree::stat - typedef cds::intrusive::ellen_bintree::stat stat; - - /// Typedef for cds::intrusive::ellen_bintree::empty_stat - typedef cds::intrusive::ellen_bintree::empty_stat empty_stat; #else using cds::intrusive::ellen_bintree::update_desc; using cds::intrusive::ellen_bintree::internal_node; using cds::intrusive::ellen_bintree::key_extractor; using cds::intrusive::ellen_bintree::update_desc_allocator; - using cds::intrusive::ellen_bintree::stat; - using cds::intrusive::ellen_bintree::empty_stat; using cds::intrusive::ellen_bintree::node_types; #endif + /// EllenBinTree internal statistics + template ::event_counter > + using stat = cds::intrusive::ellen_bintree::stat< Counter >; + + /// EllenBinTree empty internal statistics + typedef cds::intrusive::ellen_bintree::empty_stat empty_stat; /// EllenBinTree leaf node template @@ -97,10 +95,10 @@ namespace cds { namespace container { {} }; - /// Type traits for EllenBinTreeSet, EllenBinTreeMap and EllenBinTreePriorityQueue - struct type_traits + /// Type traits for EllenBinTreeSet and EllenBinTreeMap + struct traits { - /// Key extracting functor (only for EllenBinTreeSet) + /// Key extracting functor (only for \p EllenBinTreeSet) /** You should explicit define a valid functor. The functor has the following prototype: @@ -110,7 +108,7 @@ namespace cds { namespace container { }; \endcode It should initialize \p dest key from \p src data. - The functor is used to initialize internal nodes. + The functor is used to initialize internal nodes of \p EllenBinTreeSet */ typedef opt::none key_extractor; @@ -118,7 +116,7 @@ namespace cds { namespace container { /** No default functor is provided. If the option is not specified, the \p less is used. - See cds::opt::compare option description for functor interface. + See \p cds::opt::compare option description for functor interface. You should provide \p compare or \p less functor. See \ref cds_container_EllenBinTreeSet_rcu_less "predicate requirements". @@ -127,7 +125,7 @@ namespace cds { namespace container { /// Specifies binary predicate used for key compare. /** - See cds::opt::less option description for predicate interface. + See \p cds::opt::less option description. You should provide \p compare or \p less functor. See \ref cds_container_EllenBinTreeSet_rcu_less "predicate requirements". @@ -136,27 +134,27 @@ namespace cds { namespace container { /// Item counter /** - The type for item counting feature (see cds::opt::item_counter). - Default is no item counter (\ref atomicity::empty_item_counter) + The type for item counter, by default it is disabled (\p atomicity::empty_item_counter). + To enable it use \p atomicity::item_counter */ typedef atomicity::empty_item_counter item_counter; /// C++ memory ordering model /** - List of available memory ordering see opt::memory_model + List of available memory ordering see \p opt::memory_model */ typedef opt::v::relaxed_ordering memory_model; /// Allocator for update descriptors /** - The allocator type is used for \ref update_desc. + The allocator type is used for \p ellen_bintree::update_desc. Update descriptor is helping data structure with short lifetime and it is good candidate for pooling. The number of simultaneously existing descriptors is a small number limited the number of threads working with the tree. Therefore, a bounded lock-free container like \p cds::container::VyukovMPMCCycleQueue is good choice for the free-list of update descriptors, - see cds::memory::vyukov_queue_pool free-list implementation. + see \p cds::memory::vyukov_queue_pool free-list implementation. Also notice that size of update descriptor is not dependent on the type of data stored in the tree so single free-list object can be used for several \p EllenBinTree object. @@ -165,7 +163,7 @@ namespace cds { namespace container { /// Allocator for internal nodes /** - The allocator type is used for \ref internal_node. + The allocator type is used for \p ellen_bintree::internal_node. */ typedef CDS_DEFAULT_ALLOCATOR node_allocator; @@ -177,21 +175,22 @@ namespace cds { namespace container { /// Internal statistics /** - Possible types: ellen_bintree::empty_stat (the default), ellen_bintree::stat or any - other with interface like \p %stat. + By default, internal statistics is disabled (\p ellen_bintree::empty_stat). + To enable it use \p ellen_bintree::stat. */ typedef empty_stat stat; /// RCU deadlock checking policy (only for RCU-based EllenBinTreeXXX classes) /** - List of available options see opt::rcu_check_deadlock + List of available options see \p opt::rcu_check_deadlock */ typedef cds::opt::v::rcu_throw_deadlock rcu_check_deadlock; - /// Key copy policy (for EllenBinTreeMap) + /// Key copy policy (for \p EllenBinTreeMap) /** The key copy policy defines a functor to copy leaf node's key to internal node. - This policy is used only in EllenBinTreeMap. By default, assignment operator is used. + This policy is used only in \p EllenBinTreeMap. + By default, assignment operator is used. The copy functor interface is: \code @@ -204,10 +203,39 @@ namespace cds { namespace container { }; - /// Metafunction converting option list to EllenBinTreeSet traits + /// Metafunction converting option list to \p EllenBinTreeSet traits /** - This is a wrapper for cds::opt::make_options< type_traits, Options...> - \p Options list see \ref cds_container_EllenBinTreeSet "EllenBinTreeSet". + \p Options are: + - \p ellen_bintree::key_extractor - key extracting functor, mandatory option. The functor has the following prototype: + \code + struct key_extractor { + void operator ()( Key& dest, T const& src ); + }; + \endcode + It should initialize \p dest key from \p src data. The functor is used to initialize internal nodes. + - \p opt::compare - key compare functor. No default functor is provided. + If the option is not specified, \p %opt::less is used. + - \p opt::less - specifies binary predicate used for key compare. At least \p %opt::compare or \p %opt::less should be defined. + - \p opt::item_counter - the type of item counter, default is disabled (\p atomicity::empty_item_counter). + To enable it use \p atomicity::item_counter + - \p opt::memory_model - C++ memory ordering model. Can be \p opt::v::relaxed_ordering (relaxed memory model, the default) + or \p opt::v::sequential_consistent (sequentially consisnent memory model). + - \p opt::allocator - the allocator for \ref ellen_bintree::node "leaf nodes" which contains data. + Default is \ref CDS_DEFAULT_ALLOCATOR. + - \p opt::node_allocator - the allocator for internal nodes. Default is \ref CDS_DEFAULT_ALLOCATOR. + - \p ellen_bintree::update_desc_allocator - an allocator of \ref ellen_bintree::update_desc "update descriptors", + default is \ref CDS_DEFAULT_ALLOCATOR. + Note that update descriptor is helping data structure with short lifetime and it is good candidate for pooling. + The number of simultaneously existing descriptors is a relatively small number limited the number of threads + working with the tree and RCU buffer size. + Therefore, a bounded lock-free container like \p cds::container::VyukovMPMCCycleQueue is good choice for the free-list + of update descriptors, see \p cds::memory::vyukov_queue_pool free-list implementation. + Also notice that size of update descriptor is not dependent on the type of data + stored in the tree so single free-list object can be used for several EllenBinTree-based object. + - \p opt::stat - internal statistics, by default disabled (\p ellen_bintree::empty_stat). To enable + it use \p ellen_bintree::stat. + - \p opt::rcu_check_deadlock - a deadlock checking policy, only for RCU-based tree. + Default is \p opt::v::rcu_throw_deadlock. */ template struct make_set_traits { @@ -215,16 +243,46 @@ namespace cds { namespace container { typedef implementation_defined type ; ///< Metafunction result # else typedef typename cds::opt::make_options< - typename cds::opt::find_type_traits< type_traits, Options... >::type + typename cds::opt::find_type_traits< traits, Options... >::type ,Options... >::type type; # endif }; - /// Metafunction converting option list to EllenBinTreeMap traits + /// Metafunction converting option list to \p EllenBinTreeMap traits /** - This is a wrapper for cds::opt::make_options< type_traits, Options...> - \p Options list see \ref cds_container_EllenBinTreeMap "EllenBinTreeMap". + \p Options are: + - \p opt::compare - key compare functor. No default functor is provided. + If the option is not specified, \p %opt::less is used. + - \p opt::less - specifies binary predicate used for key compare. At least \p %opt::compare or \p %opt::less should be defined. + - \p opt::item_counter - the type of item counter, default is disabled (\p atomicity::empty_item_counter). + To enable it use \p atomicity::item_counter + - opt::memory_model - C++ memory ordering model. Can be \p opt::v::relaxed_ordering (relaxed memory model, the default) + or \p opt::v::sequential_consistent (sequentially consisnent memory model). + - \p opt::allocator - the allocator used for \ref ellen_bintree::map_node "leaf nodes" which contains data. + Default is \ref CDS_DEFAULT_ALLOCATOR. + - \p opt::node_allocator - the allocator used for \ref ellen_bintree::internal_node "internal nodes". + Default is \ref CDS_DEFAULT_ALLOCATOR. + - \p ellen_bintree::update_desc_allocator - an allocator of \ref ellen_bintree::update_desc "update descriptors", + default is \ref CDS_DEFAULT_ALLOCATOR. + Note that update descriptor is helping data structure with short lifetime and it is good candidate for pooling. + The number of simultaneously existing descriptors is a relatively small number limited the number of threads + working with the tree and RCU buffer size. + Therefore, a bounded lock-free container like \p cds::container::VyukovMPMCCycleQueue is good choice for the free-list + of update descriptors, see \p cds::memory::vyukov_queue_pool free-list implementation. + Also notice that size of update descriptor is not dependent on the type of data + stored in the tree so single free-list object can be used for several EllenBinTree-based object. + - \p opt::stat - internal statistics, by default disabled (\p ellen_bintree::empty_stat). To enable + it use \p ellen_bintree::stat. + - \p opt::rcu_check_deadlock - a deadlock checking policy, only for RCU-based tree. Default is \p opt::v::rcu_throw_deadlock + - opt::copy_policy - key copying policy defines a functor to copy leaf node's key to internal node. + By default, assignment operator is used. + The copy functor interface is: + \code + struct copy_functor { + void operator()( Key& dest, Key const& src ); + }; + \endcode */ template struct make_map_traits { @@ -232,7 +290,7 @@ namespace cds { namespace container { typedef implementation_defined type ; ///< Metafunction result # else typedef typename cds::opt::make_options< - typename cds::opt::find_type_traits< type_traits, Options... >::type + typename cds::opt::find_type_traits< traits, Options... >::type ,Options... >::type type; # endif @@ -247,7 +305,7 @@ namespace cds { namespace container { typedef GC gc; typedef Key key_type; typedef T value_type; - typedef Traits original_type_traits; + typedef Traits original_traits; typedef node< gc, value_type > leaf_node; @@ -255,7 +313,7 @@ namespace cds { namespace container { { void operator()( key_type& dest, leaf_node const& src ) const { - typename original_type_traits::key_extractor()( dest, src.m_Value ); + typename original_traits::key_extractor()( dest, src.m_Value ); } }; @@ -267,9 +325,9 @@ namespace cds { namespace container { } }; - typedef typename cds::opt::details::make_comparator< value_type, original_type_traits, false >::type key_comparator; + typedef typename cds::opt::details::make_comparator< value_type, original_traits, false >::type key_comparator; - typedef cds::details::Allocator< leaf_node, typename original_type_traits::allocator> cxx_leaf_node_allocator; + typedef cds::details::Allocator< leaf_node, typename original_traits::allocator> cxx_leaf_node_allocator; struct leaf_deallocator { void operator()( leaf_node * p ) const @@ -278,7 +336,7 @@ namespace cds { namespace container { } }; - struct intrusive_type_traits: public original_type_traits + struct intrusive_traits: public original_traits { typedef cds::intrusive::ellen_bintree::base_hook< cds::opt::gc< gc > > hook; typedef intrusive_key_extractor key_extractor; @@ -287,7 +345,7 @@ namespace cds { namespace container { }; // Metafunction result - typedef cds::intrusive::EllenBinTree< gc, key_type, leaf_node, intrusive_type_traits > type; + typedef cds::intrusive::EllenBinTree< gc, key_type, leaf_node, intrusive_traits > type; }; template < class GC, typename Key, typename T, class Traits> @@ -299,7 +357,7 @@ namespace cds { namespace container { typedef map_node< gc, key_type, mapped_type > leaf_node; typedef typename leaf_node::value_type value_type; - typedef Traits original_type_traits; + typedef Traits original_traits; struct assignment_copy_policy { void operator()( key_type& dest, key_type const& src ) @@ -308,9 +366,9 @@ namespace cds { namespace container { } }; typedef typename std::conditional< - std::is_same< typename original_type_traits::copy_policy, opt::none >::value, + std::is_same< typename original_traits::copy_policy, opt::none >::value, assignment_copy_policy, - typename original_type_traits::copy_policy + typename original_traits::copy_policy >::type copy_policy; struct intrusive_key_extractor @@ -329,9 +387,9 @@ namespace cds { namespace container { } }; - typedef typename cds::opt::details::make_comparator< key_type, original_type_traits, false >::type key_comparator; + typedef typename cds::opt::details::make_comparator< key_type, original_traits, false >::type key_comparator; - typedef cds::details::Allocator< leaf_node, typename original_type_traits::allocator> cxx_leaf_node_allocator; + typedef cds::details::Allocator< leaf_node, typename original_traits::allocator> cxx_leaf_node_allocator; struct leaf_deallocator { void operator()( leaf_node * p ) const @@ -340,7 +398,7 @@ namespace cds { namespace container { } }; - struct intrusive_type_traits: public original_type_traits + struct intrusive_traits: public original_traits { typedef cds::intrusive::ellen_bintree::base_hook< cds::opt::gc< gc > > hook; typedef intrusive_key_extractor key_extractor; @@ -349,7 +407,7 @@ namespace cds { namespace container { }; // Metafunction result - typedef cds::intrusive::EllenBinTree< gc, key_type, leaf_node, intrusive_type_traits > type; + typedef cds::intrusive::EllenBinTree< gc, key_type, leaf_node, intrusive_traits > type; }; } // namespace details @@ -358,10 +416,10 @@ namespace cds { namespace container { // Forward declarations //@cond - template < class GC, typename Key, typename T, class Traits = ellen_bintree::type_traits > + template < class GC, typename Key, typename T, class Traits = ellen_bintree::traits > class EllenBinTreeSet; - template < class GC, typename Key, typename T, class Traits = ellen_bintree::type_traits > + template < class GC, typename Key, typename T, class Traits = ellen_bintree::traits > class EllenBinTreeMap; //@endcond diff --git a/cds/container/impl/ellen_bintree_set.h b/cds/container/impl/ellen_bintree_set.h index 632b2b78..8ce86730 100644 --- a/cds/container/impl/ellen_bintree_set.h +++ b/cds/container/impl/ellen_bintree_set.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_IMPL_ELLEN_BINTREE_SET_H #define __CDS_CONTAINER_IMPL_ELLEN_BINTREE_SET_H -#include +#include #include #include #include @@ -39,53 +39,24 @@ namespace cds { namespace container { Helping will be implemented in future release Template arguments : - - \p GC - safe memory reclamation (i.e. light-weight garbage collector) type, like cds::gc::HP, cds::gc::PTB - Note that cds::gc::HRC is not supported. + - \p GC - safe memory reclamation (i.e. light-weight garbage collector) type, like \p cds::gc::HP, cds::gc::DHP - \p Key - key type, a subset of \p T - \p T - type to be stored in tree's leaf nodes. - - \p Traits - type traits. See ellen_bintree::type_traits for explanation. - - It is possible to declare option-based tree with ellen_bintree::make_set_traits metafunction - instead of \p Traits template argument. - Template argument list \p Options of ellen_bintree::make_set_traits metafunction are: - - ellen_bintree::key_extractor - key extracting functor, mandatory option. The functor has the following prototype: - \code - struct key_extractor { - void operator ()( Key& dest, T const& src ); - }; - \endcode - It should initialize \p dest key from \p src data. The functor is used to initialize internal nodes. - - opt::compare - key compare functor. No default functor is provided. - If the option is not specified, \p %opt::less is used. - - opt::less - specifies binary predicate used for key compare. At least \p %opt::compare or \p %opt::less should be defined. - - opt::item_counter - the type of item counting feature. Default is \ref atomicity::empty_item_counter that is no item counting. - - opt::memory_model - C++ memory ordering model. Can be opt::v::relaxed_ordering (relaxed memory model, the default) - or opt::v::sequential_consistent (sequentially consisnent memory model). - - opt::allocator - the allocator used for \ref ellen_bintree::node "leaf nodes" which contains data. - Default is \ref CDS_DEFAULT_ALLOCATOR. - - opt::node_allocator - the allocator used for internal nodes. Default is \ref CDS_DEFAULT_ALLOCATOR. - - ellen_bintree::update_desc_allocator - an allocator of \ref ellen_bintree::update_desc "update descriptors", - default is \ref CDS_DEFAULT_ALLOCATOR. - Note that update descriptor is helping data structure with short lifetime and it is good candidate for pooling. - The number of simultaneously existing descriptors is a relatively small number limited the number of threads - working with the tree and GC buffer size. - Therefore, a bounded lock-free container like \p cds::container::VyukovMPMCCycleQueue is good choice for the free-list - of update descriptors, see cds::memory::vyukov_queue_pool free-list implementation. - Also notice that size of update descriptor is not dependent on the type of data - stored in the tree so single free-list object can be used for several EllenBinTree-based object. - - opt::stat - internal statistics. Available types: ellen_bintree::stat, ellen_bintree::empty_stat (the default) + - \p Traits - set traits, default is \p ellen_bintree::traits + It is possible to declare option-based tree with \p ellen_bintree::make_set_traits metafunction + instead of \p Traits template argument. @note Do not include header file directly. There are header file for each GC type: - - - for Hazard Pointer GC cds::gc::HP - - - for Pass-the-Buck GC cds::gc::PTB + - - for \p cds::gc::HP + - - for \p cds::gc::DHP - - for RCU GC (see \ref cds_container_EllenBinTreeSet_rcu "RCU-based EllenBinTreeSet") @anchor cds_container_EllenBinTreeSet_less Predicate requirements - opt::less, opt::compare and other predicates using with member fuctions should accept at least parameters + \p Traits::less, \p Traits::compare and other predicates using with member fuctions should accept at least parameters of type \p T and \p Key in any combination. For example, for \p Foo struct with \p std::string key field the appropiate \p less functor is: \code @@ -125,7 +96,7 @@ namespace cds { namespace container { typename Key, typename T, #ifdef CDS_DOXYGEN_INVOKED - class Traits = ellen_bintree::type_traits + class Traits = ellen_bintree::traits #else class Traits #endif @@ -143,24 +114,24 @@ namespace cds { namespace container { //@endcond public: - typedef GC gc ; ///< Garbage collector - typedef Key key_type ; ///< type of a key stored in internal nodes; key is a part of \p value_type - typedef T value_type ; ///< type of value stored in the binary tree - typedef Traits options ; ///< Traits template parameter + typedef GC gc; ///< Garbage collector + typedef Key key_type; ///< type of a key to be stored in internal nodes; key is a part of \p value_type + typedef T value_type; ///< type of value to be stored in the binary tree + typedef Traits traits; ///< Traits template parameter # ifdef CDS_DOXYGEN_INVOKED typedef implementation_defined key_comparator ; ///< key compare functor based on opt::compare and opt::less option setter. # else typedef typename maker::intrusive_type_traits::compare key_comparator; # endif - typedef typename base_class::item_counter item_counter ; ///< Item counting policy used - typedef typename base_class::memory_model memory_model ; ///< Memory ordering. See cds::opt::memory_model option - typedef typename base_class::stat stat ; ///< internal statistics type - typedef typename options::key_extractor key_extractor ; ///< key extracting functor + typedef typename base_class::item_counter item_counter; ///< Item counting policy used + typedef typename base_class::memory_model memory_model; ///< Memory ordering. See cds::opt::memory_model option + typedef typename base_class::stat stat; ///< internal statistics type + typedef typename traits::key_extractor key_extractor; ///< key extracting functor - typedef typename options::allocator allocator_type ; ///< Allocator for leaf nodes - typedef typename base_class::node_allocator node_allocator ; ///< Internal node allocator - typedef typename base_class::update_desc_allocator update_desc_allocator ; ///< Update descriptor allocator + typedef typename traits::allocator allocator_type; ///< Allocator for leaf nodes + typedef typename base_class::node_allocator node_allocator; ///< Internal node allocator + typedef typename base_class::update_desc_allocator update_desc_allocator; ///< Update descriptor allocator protected: //@cond @@ -179,9 +150,7 @@ namespace cds { namespace container { /// Default constructor EllenBinTreeSet() : base_class() - { - //static_assert( (std::is_same::value || std::is_same::value), "GC must be cds::gc::HP or cds:gc::PTB" ); - } + {} /// Clears the set ~EllenBinTreeSet() @@ -222,8 +191,7 @@ namespace cds { namespace container { \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. It may be passed by reference - using \p std::ref + The user-defined functor is called only if the inserting is success. */ template bool insert( Q const& val, Func f ) @@ -261,11 +229,11 @@ namespace cds { namespace container { 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. - Returns std::pair where \p first is true if operation is successfull, \p second is true if new item has been added or \p false if the item with \p key already is in the set. + + @warning See \ref cds_intrusive_item_creating "insert item troubleshooting" */ template std::pair ensure( const Q& val, Func func ) @@ -278,7 +246,7 @@ namespace cds { namespace container { return bRes; } - /// Inserts data of type \ref value_type constructed with std::forward(args)... + /// Inserts data of type \p value_type created in-place from \p args /** Returns \p true if inserting successful, \p false otherwise. */ @@ -332,7 +300,6 @@ namespace cds { namespace container { void operator()(value_type const& val); }; \endcode - The functor may be passed by reference using boost:ref Since the key of MichaelHashSet's \p value_type is not explicitly specified, template parameter \p Q defines the key type searching in the list. @@ -429,18 +396,18 @@ namespace cds { namespace container { cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >()); } - /// Find the key \p val + /// Find the key \p key /** @anchor cds_nonintrusive_EllenBinTreeSet_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 may pass \p f argument by reference using \p std::ref. @@ -449,21 +416,28 @@ namespace cds { namespace container { The functor does not serialize simultaneous access to the set's \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 may 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 base_class::find( val, [&f]( leaf_node& node, Q& v ) { f( node.m_Value, v ); }); + return base_class::find( key, [&f]( leaf_node& node, Q& v ) { f( node.m_Value, v ); }); } + //@cond + template + bool find( Q const& key, Func f ) + { + return base_class::find( key, [&f]( leaf_node& node, Q const& v ) { f( node.m_Value, v ); } ); + } + //@endcond - /// 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_nonintrusive_EllenBinTreeSet_find_func "find(Q&, Func)" but \p pred is used for key comparing. @@ -471,72 +445,36 @@ namespace cds { namespace container { \p Less 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 base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), + return base_class::find_with( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), [&f]( leaf_node& node, Q& v ) { f( node.m_Value, v ); } ); } - - /// Find the key \p val - /** @anchor cds_nonintrusive_EllenBinTreeSet_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 may 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's \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 may 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 base_class::find( val, [&f]( leaf_node& node, Q const& v ) { f( node.m_Value, v ); }); - } - - /// Finds the key \p val using \p pred predicate for searching - /** - The function is an analog of \ref cds_nonintrusive_EllenBinTreeSet_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 Less must imply the same element order as the comparator used for building the set. - */ + //@cond template - bool find_with( Q const& val, Less pred, Func f ) + bool find_with( Q const& key, Less pred, Func f ) { - return base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), - [&f]( leaf_node& node, Q const& v ) { f( node.m_Value, v ); } ); + return base_class::find_with( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), + [&f]( leaf_node& node, Q const& v ) { f( node.m_Value, v ); } ); } + //@endcond - /// Find the key \p val + /// Find the key \p key /** @anchor cds_nonintrusive_EllenBinTreeSet_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 may be not the same as \ref value_type. */ template - bool find( Q const & val ) + bool find( Q const & key ) { - return base_class::find( val ); + return base_class::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_nonintrusive_EllenBinTreeSet_find_val "find(Q const&)" but \p pred is used for key comparing. @@ -544,9 +482,9 @@ namespace cds { namespace container { \p Less 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 base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >()); + return base_class::find_with( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >()); } /// Finds \p key and returns the item found @@ -578,7 +516,7 @@ namespace cds { namespace container { cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >() ); } - /// Clears the set (non-atomic) + /// Clears the set (not atomic) /** The function unlink all items from the tree. The function is not atomic, thus, in multi-threaded environment with parallel insertions @@ -607,8 +545,9 @@ namespace cds { namespace container { Only leaf nodes containing user data are counted. The value returned depends on item counter type provided by \p Traits template parameter. - If it is atomicity::empty_item_counter this function always returns 0. - Therefore, the function is not suitable for checking the tree emptiness, use \ref empty + If it is \p atomicity::empty_item_counter this function always returns 0. + + The function is not suitable for checking the tree emptiness, use \p empty() member function for this purpose. */ size_t size() const