X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=cds%2Fcontainer%2Fellen_bintree_set_rcu.h;h=dd5c41918c351f1ca76e655e062d4ee6e0967e47;hp=e606ec3bc3377bfa8ed942d277473664319d229c;hb=1132246d5685f87a5b240e077b7e88d56e38b1ff;hpb=98aa954aa9d1b640f6f6d81018542eec1c2046bb diff --git a/cds/container/ellen_bintree_set_rcu.h b/cds/container/ellen_bintree_set_rcu.h index e606ec3b..dd5c4191 100644 --- a/cds/container/ellen_bintree_set_rcu.h +++ b/cds/container/ellen_bintree_set_rcu.h @@ -1,9 +1,37 @@ -//$$CDS-header$$ +/* + This file is a part of libcds - Concurrent Data Structures library -#ifndef __CDS_CONTAINER_ELLEN_BINTREE_SET_RCU_H -#define __CDS_CONTAINER_ELLEN_BINTREE_SET_RCU_H + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017 -#include + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef CDSLIB_CONTAINER_ELLEN_BINTREE_SET_RCU_H +#define CDSLIB_CONTAINER_ELLEN_BINTREE_SET_RCU_H + +#include #include namespace cds { namespace container { @@ -30,7 +58,7 @@ namespace cds { namespace container { the priority value plus some uniformly distributed random value. @warning Recall the tree is unbalanced. The complexity of operations is O(log N) - for uniformly distributed random keys, but in worst case the complexity is O(N). + for uniformly distributed random keys, but in the worst case the complexity is O(N). @note In the current implementation we do not use helping technique described in original paper. So, the current implementation is near to fine-grained lock-based tree. @@ -40,38 +68,9 @@ namespace cds { namespace container { - \p RCU - one of \ref cds_urcu_gc "RCU type" - \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 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 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) - - opt::rcu_check_deadlock - a deadlock checking policy. Default is opt::v::rcu_throw_deadlock + - \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 Before including you should include appropriate RCU header file, see \ref cds_urcu_gc "RCU type" for list of existing RCU class and corresponding header files. @@ -120,7 +119,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 @@ -138,111 +137,45 @@ namespace cds { namespace container { //@endcond public: - typedef cds::urcu::gc gc ; ///< RCU 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 cds::urcu::gc gc; ///< RCU 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 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. + typedef implementation_defined key_comparator; ///< key compare functor based on \p Traits::compare and \p Traits::less # else - typedef typename maker::intrusive_type_traits::compare key_comparator; + typedef typename maker::intrusive_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 base_class::rcu_check_deadlock rcu_check_deadlock ; ///< Deadlock checking policy - typedef typename options::key_extractor key_extractor ; ///< key extracting functor + typedef typename base_class::item_counter item_counter; ///< Item counting policy + typedef typename base_class::memory_model memory_model; ///< Memory ordering, see \p cds::opt::memory_model + typedef typename base_class::stat stat; ///< internal statistics type + typedef typename base_class::rcu_check_deadlock rcu_check_deadlock; ///< Deadlock checking policy + typedef typename traits::key_extractor key_extractor; ///< key extracting functor + typedef typename traits::back_off back_off; ///< Back-off strategy - 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 - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions do not require external locking + 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 + + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions do not require external locking protected: //@cond typedef typename maker::cxx_leaf_node_allocator cxx_leaf_node_allocator; typedef typename base_class::value_type leaf_node; typedef typename base_class::internal_node internal_node; - typedef std::unique_ptr< leaf_node, typename maker::intrusive_type_traits::disposer > scoped_node_ptr; + typedef std::unique_ptr< leaf_node, typename maker::intrusive_traits::disposer > scoped_node_ptr; //@endcond public: - typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock + typedef typename gc::scoped_lock rcu_lock; ///< RCU scoped lock /// pointer to extracted node - typedef cds::urcu::exempt_ptr< gc, leaf_node, value_type, typename maker::intrusive_type_traits::disposer, - cds::urcu::details::conventional_exempt_member_cast - > exempt_ptr; - - protected: - //@cond -# ifndef CDS_CXX11_LAMBDA_SUPPORT - template - struct insert_functor - { - Func m_func; - - insert_functor ( Func f ) - : m_func(f) - {} - - void operator()( leaf_node& node ) - { - cds::unref(m_func)( node.m_Value ); - } - }; - - template - struct ensure_functor - { - Func m_func; - Q const& m_arg; - - ensure_functor( Q const& arg, Func f ) - : m_func(f) - , m_arg( arg ) - {} - - void operator ()( bool bNew, leaf_node& node, leaf_node& ) - { - cds::unref(m_func)( bNew, node.m_Value, m_arg ); - } - }; - - template - struct erase_functor - { - Func m_func; - - erase_functor( Func f ) - : m_func(f) - {} - - void operator()( leaf_node const& node ) - { - cds::unref(m_func)( node.m_Value ); - } - }; - - template - struct find_functor - { - Func m_func; - - find_functor( Func f ) - : m_func(f) - {} - - template - void operator ()( leaf_node& node, Q& val ) - { - cds::unref(m_func)( node.m_Value, val ); - } - }; -#endif - //@endcond + using exempt_ptr = cds::urcu::exempt_ptr < gc, leaf_node, value_type, typename maker::intrusive_traits::disposer, + cds::urcu::details::conventional_exempt_member_cast < leaf_node, value_type > + >; public: /// Default constructor @@ -263,7 +196,7 @@ namespace cds { namespace container { The object of \ref value_type should be constructible from a value of type \p Q. In trivial case, \p Q is equal to \ref value_type. - RCU \p synchronize method can be called. RCU should not be locked. + RCU \p synchronize() method can be called. RCU should not be locked. Returns \p true if \p val is inserted into the set, \p false otherwise. */ @@ -271,7 +204,7 @@ namespace cds { namespace container { bool insert( Q const& val ) { scoped_node_ptr sp( cxx_leaf_node_allocator().New( val )); - if ( base_class::insert( *sp.get() )) { + if ( base_class::insert( *sp.get())) { sp.release(); return true; } @@ -291,98 +224,85 @@ 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 boost::ref + The user-defined functor is called only if the inserting is success. - RCU \p synchronize method can be called. RCU should not be locked. + RCU \p synchronize() can be called. RCU should not be locked. */ template bool insert( Q const& val, Func f ) { scoped_node_ptr sp( cxx_leaf_node_allocator().New( val )); -# ifdef CDS_CXX11_LAMBDA_SUPPORT - if ( base_class::insert( *sp.get(), [&f]( leaf_node& val ) { cds::unref(f)( val.m_Value ); } )) -# else - insert_functor wrapper(f); - if ( base_class::insert( *sp, cds::ref(wrapper) )) -# endif - { + if ( base_class::insert( *sp.get(), [&f]( leaf_node& v ) { f( v.m_Value ); } )) { sp.release(); return true; } return false; } - /// Ensures that the item exists in the set + /// Updates the node /** The operation performs inserting or changing data with lock-free manner. - If the \p val key not found in the set, then the new item created from \p val - is inserted into the set. Otherwise, the functor \p func is called with the item found. - The functor \p Func should be a function with signature: + If the item \p val is not found in the set, then \p val is inserted into the set + iff \p bAllowInsert is \p true. + Otherwise, the functor \p func is called with item found. + The functor \p func signature is: \code - void func( bool bNew, value_type& item, const Q& val ); + void func( bool bNew, value_type& item, value_type& val ); \endcode - or a functor: - \code - struct my_functor { - void operator()( bool bNew, value_type& item, const Q& val ); - }; - \endcode - with arguments: - \p bNew - \p true if the item has been inserted, \p false otherwise - \p item - item of the set - - \p val - argument \p key passed into the \p ensure function + - \p val - argument \p val passed into the \p %update() function - The functor may change non-key fields of the \p item; however, \p func must guarantee + 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 may pass \p func argument by reference using boost::ref. - RCU \p synchronize method can be called. RCU should not be locked. - 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. + Returns std::pair where \p first is \p true if operation is successful, + i.e. the node has been inserted or updated, + \p second is \p true if new item has been added or \p false if the item with \p key + already exists. + + @warning See \ref cds_intrusive_item_creating "insert item troubleshooting" */ template - std::pair ensure( const Q& val, Func func ) + std::pair update( Q const& val, Func func, bool bAllowInsert = true ) { scoped_node_ptr sp( cxx_leaf_node_allocator().New( val )); -# ifdef CDS_CXX11_LAMBDA_SUPPORT - std::pair bRes = base_class::ensure( *sp, - [&func, &val](bool bNew, leaf_node& node, leaf_node&){ cds::unref(func)( bNew, node.m_Value, val ); }); -# else - ensure_functor wrapper( val, func ); - std::pair bRes = base_class::ensure( *sp, cds::ref(wrapper)); -# endif + std::pair bRes = base_class::update( *sp, + [&func, &val](bool bNew, leaf_node& node, leaf_node&){ func( bNew, node.m_Value, val ); }, + bAllowInsert ); if ( bRes.first && bRes.second ) sp.release(); return bRes; } + //@cond + template + CDS_DEPRECATED("ensure() is deprecated, use update()") + std::pair ensure( const Q& val, Func func ) + { + return update( val, func, true ); + } + //@endcond -# ifdef CDS_EMPLACE_SUPPORT - /// 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. RCU \p synchronize method can be called. RCU should not be locked. - - @note This function is available only for compiler that supports - variadic template and move semantics */ template bool emplace( Args&&... args ) { - scoped_node_ptr sp( cxx_leaf_node_allocator().New( std::forward(args)... )); - if ( base_class::insert( *sp.get() )) { + scoped_node_ptr sp( cxx_leaf_node_allocator().MoveNew( std::forward(args)... )); + if ( base_class::insert( *sp.get())) { sp.release(); return true; } return false; } -# endif /// Delete \p key from the set /** \anchor cds_nonintrusive_EllenBinTreeSet_rcu_erase_val @@ -410,6 +330,7 @@ namespace cds { namespace container { template bool erase_with( Q const& key, Less pred ) { + CDS_UNUSED( pred ); return base_class::erase_with( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >()); } @@ -425,7 +346,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. @@ -441,12 +361,7 @@ namespace cds { namespace container { template bool erase( Q const& key, Func f ) { -# ifdef CDS_CXX11_LAMBDA_SUPPORT - return base_class::erase( key, [&f]( leaf_node const& node) { cds::unref(f)( node.m_Value ); } ); -# else - erase_functor wrapper(f); - return base_class::erase( key, cds::ref(wrapper)); -# endif + return base_class::erase( key, [&f]( leaf_node const& node) { f( node.m_Value ); } ); } /// Deletes the item from the set using \p pred predicate for searching @@ -459,19 +374,15 @@ namespace cds { namespace container { template bool erase_with( Q const& key, Less pred, Func f ) { -# ifdef CDS_CXX11_LAMBDA_SUPPORT + CDS_UNUSED( pred ); return base_class::erase_with( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), - [&f]( leaf_node const& node) { cds::unref(f)( node.m_Value ); } ); -# else - erase_functor wrapper(f); - return base_class::erase_with( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), cds::ref(wrapper)); -# endif + [&f]( leaf_node const& node) { f( node.m_Value ); } ); } /// Extracts an item with minimal key from the set /** - If the set is not empty, the function returns \p true, \p result contains a pointer to value. - If the set is empty, the function returns \p false, \p result is left unchanged. + Returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the leftmost item. + If the set is empty, returns empty \p exempt_ptr. @note Due the concurrent nature of the set, the function extracts nearly minimum key. It means that the function gets leftmost leaf of the tree and tries to unlink it. @@ -480,19 +391,18 @@ namespace cds { namespace container { RCU \p synchronize method can be called. RCU should NOT be locked. The function does not free the item. - The deallocator will be implicitly invoked when \p result object is destroyed or when - result.release() is called, see cds::urcu::exempt_ptr for explanation. - @note Before reusing \p result object you should call its \p release() method. + The deallocator will be implicitly invoked when the returned object is destroyed or when + its \p release() member function is called. */ - bool extract_min( exempt_ptr& result ) + exempt_ptr extract_min() { - return base_class::extract_min_( result ); + return exempt_ptr( base_class::extract_min_()); } /// Extracts an item with maximal key from the set /** - If the set is not empty, the function returns \p true, \p result contains a pointer to extracted item. - If the set is empty, the function returns \p false, \p result is left unchanged. + Returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the rightmost item. + If the set is empty, returns empty \p exempt_ptr. @note Due the concurrent nature of the set, the function extracts nearly maximal key. It means that the function gets rightmost leaf of the tree and tries to unlink it. @@ -501,69 +411,65 @@ namespace cds { namespace container { RCU \p synchronize method can be called. RCU should NOT be locked. The function does not free the item. - The deallocator will be implicitly invoked when \p result object is destroyed or when - result.release() is called, see cds::urcu::exempt_ptr for explanation. - @note Before reusing \p result object you should call its \p release() method. + The deallocator will be implicitly invoked when the returned object is destroyed or when + its \p release() member function is called. */ - bool extract_max( exempt_ptr& result ) + exempt_ptr extract_max() { - return base_class::extract_max_( result ); + return exempt_ptr( base_class::extract_max_()); } /// Extracts an item from the set /** \anchor cds_nonintrusive_EllenBinTreeSet_rcu_extract The function searches an item with key equal to \p key in the tree, - unlinks it, and returns pointer to an item found in \p result parameter. - If \p key is not found the function returns \p false. + unlinks it, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to an item found. + If \p key is not found the function returns an empty \p exempt_ptr. RCU \p synchronize method can be called. RCU should NOT be locked. The function does not destroy the item found. - The dealloctor will be implicitly invoked when \p result object is destroyed or when - result.release() is called, see cds::urcu::exempt_ptr for explanation. - @note Before reusing \p result object you should call its \p release() method. + The dealloctor will be implicitly invoked when the returned object is destroyed or when + its release() member function is called. */ template - bool extract( exempt_ptr& result, Q const& key ) + exempt_ptr extract( Q const& key ) { - return base_class::extract_( result, key, typename base_class::node_compare()); + return exempt_ptr( base_class::extract_( key, typename base_class::node_compare())); } /// Extracts an item from the set using \p pred for searching /** - The function is an analog of \ref cds_nonintrusive_EllenBinTreeSet_rcu_extract "extract(exempt_ptr&, Q const&)" - but \p pred is used for key compare. + The function is an analog of \p extract(Q const&) but \p pred is used for key compare. \p Less has the interface like \p std::less and should meet \ref cds_container_EllenBinTreeSet_rcu_less "predicate requirements". \p pred must imply the same element order as the comparator used for building the set. */ template - bool extract_with( exempt_ptr& result, Q const& val, Less pred ) + exempt_ptr extract_with( Q const& key, Less pred ) { - return base_class::extract_with_( result, val, - cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >() ); + CDS_UNUSED( pred ); + return exempt_ptr( base_class::extract_with_( key, + 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_rcu_find_func - The function searches the item with key equal to \p val and calls the functor \p f for item found. + The function searches the item with key equal to \p key and calls the functor \p f for item found. The interface of \p Func functor is: \code struct functor { - void operator()( value_type& item, Q& val ); + void operator()( value_type& item, Q& key ); }; \endcode - where \p item is the item found, \p val is the find function argument. - - You may pass \p f argument by reference using boost::ref or cds::ref. + where \p item is the item found, \p key is the find function argument. 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. - 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 @@ -571,20 +477,22 @@ namespace cds { namespace container { 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 ) const + bool find( Q& key, Func f ) const { -# ifdef CDS_CXX11_LAMBDA_SUPPORT - return base_class::find( val, [&f]( leaf_node& node, Q& v ) { cds::unref(f)( node.m_Value, v ); }); -# else - find_functor wrapper(f); - return base_class::find( val, cds::ref(wrapper)); -# endif + 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 ) const + { + 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_rcu_find_func "find(Q&, Func)" but \p pred is used for key comparing. @@ -592,109 +500,70 @@ 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 ) const + bool find_with( Q& key, Less pred, Func f ) const { -# ifdef CDS_CXX11_LAMBDA_SUPPORT - return base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), - [&f]( leaf_node& node, Q& v ) { cds::unref(f)( node.m_Value, v ); } ); -# else - find_functor wrapper(f); - return base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), - cds::ref(wrapper)); -# endif + CDS_UNUSED( pred ); + 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_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 may pass \p f argument by reference using boost::ref or cds::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 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 ) const - { -# ifdef CDS_CXX11_LAMBDA_SUPPORT - return base_class::find( val, [&f]( leaf_node& node, Q const& v ) { cds::unref(f)( node.m_Value, v ); }); -# else - find_functor wrapper(f); - return base_class::find( val, cds::ref(wrapper)); -# endif - } - - /// Finds the key \p val using \p pred predicate for searching - /** - The function is an analog of \ref cds_nonintrusive_EllenBinTreeSet_rcu_find_cfunc "find(Q const&, Func)" - but \p pred is used for key comparing. - \p Less functor has the interface like \p std::less. - \p 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 ) const + bool find_with( Q const& key, Less pred, Func f ) const { -# ifdef CDS_CXX11_LAMBDA_SUPPORT - return base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), - [&f]( leaf_node& node, Q const& v ) { cds::unref(f)( node.m_Value, v ); } ); -# else - find_functor wrapper(f); - return base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >(), - cds::ref(wrapper)); -# endif + CDS_UNUSED( pred ); + 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 - /** @anchor cds_nonintrusive_EllenBinTreeSet_rcu_find_val - - The function searches the item with key equal to \p val + /// Checks whether the set contains \p key + /** + 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. - The function applies RCU lock internally. */ template - bool find( Q const & val ) const + bool contains( Q const& key ) const { - return base_class::find( val ); + return base_class::contains( key ); } + //@cond + template + CDS_DEPRECATED("deprecated, use contains()") + bool find( Q const& key ) const + { + return contains( key ); + } + //@endcond - /// Finds the key \p val using \p pred predicate for searching + /// Checks whether the set contains \p key using \p pred predicate for searching /** - The function is an analog of \ref cds_nonintrusive_EllenBinTreeSet_rcu_find_val "find(Q const&)" - but \p pred is used for key comparing. - \p Less functor has the interface like \p std::less. + The function is similar to contains( key ) but \p pred is used for key comparing. + \p Less functor has the interface like \p std::less and should meet \ref cds_intrusive_EllenBinTree_rcu_less + "Predicate requirements". \p Less must imply the same element order as the comparator used for building the set. + \p pred should accept arguments of type \p Q, \p key_type, \p value_type in any combination. */ template - bool find_with( Q const& val, Less pred ) const + bool contains( Q const& key, Less pred ) const { - return base_class::find_with( val, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >()); + CDS_UNUSED( pred ); + return base_class::contains( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >()); } + //@cond + template + CDS_DEPRECATED("deprecated, use contains()") + bool find_with( Q const& key, Less pred ) const + { + return contains( key, pred ); + } + //@endcond /// Finds \p key and return the item found /** \anchor cds_nonintrusive_EllenBinTreeSet_rcu_get 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 NULL. + If \p key is not found it returns \p nullptr. RCU should be locked before call the function. Returned pointer is valid while RCU is locked. @@ -718,6 +587,7 @@ namespace cds { namespace container { template value_type * get_with( Q const& key, Less pred ) const { + CDS_UNUSED( pred ); leaf_node * pNode = base_class::get_with( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >()); return pNode ? &pNode->m_Value : nullptr; @@ -730,7 +600,7 @@ namespace cds { namespace container { this sequence \code set.clear(); - assert( set.empty() ); + assert( set.empty()); \endcode the assertion could be raised. @@ -754,8 +624,8 @@ 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 \p %size() always returns 0. + Therefore, the function is not suitable for checking the tree emptiness, use \p empty() member function for this purpose. */ size_t size() const @@ -777,9 +647,7 @@ namespace cds { namespace container { { return base_class::check_consistency(); } - }; - }} // namespace cds::container -#endif // #ifndef __CDS_CONTAINER_ELLEN_BINTREE_SET_RCU_H +#endif // #ifndef CDSLIB_CONTAINER_ELLEN_BINTREE_SET_RCU_H