X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=cds%2Fcontainer%2Fmichael_kvlist_rcu.h;h=7545e48c7fcb0b0b1f8086f4e209b1da3072591c;hp=aaf03ae703b518365c36f5c4f72d0121d3c31b25;hb=55dac5c902cf22ef7588b97ce412a107be3d2d05;hpb=58cd5ed861249381cdf697ef5b82a64e0f9e4ad3 diff --git a/cds/container/michael_kvlist_rcu.h b/cds/container/michael_kvlist_rcu.h index aaf03ae7..7545e48c 100644 --- a/cds/container/michael_kvlist_rcu.h +++ b/cds/container/michael_kvlist_rcu.h @@ -4,11 +4,10 @@ #define __CDS_CONTAINER_MICHAEL_KVLIST_RCU_H #include +#include // ref #include #include #include -#include -#include namespace cds { namespace container { @@ -27,12 +26,12 @@ namespace cds { namespace container { - \p RCU - one of \ref cds_urcu_gc "RCU type" - \p Key - key type of an item stored in the list. It should be copy-constructible - \p Value - value type stored in a list - - \p Traits - type traits, default is michael_list::type_traits + - \p Traits - type traits, default is \p michael_list::traits @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. - It is possible to declare option-based list with cds::container::michael_list::make_traits metafunction istead of \p Traits template + It is possible to declare option-based list using \p cds::container::michael_list::make_traits metafunction istead of \p Traits template argument. For example, the following traits-based declaration of Michael's list \code #include @@ -45,8 +44,8 @@ namespace cds { namespace container { } }; - // Declare type_traits - struct my_traits: public cds::container::michael_list::type_traits + // Declare traits + struct my_traits: public cds::container::michael_list::traits { typedef my_compare compare; }; @@ -69,24 +68,13 @@ namespace cds { namespace container { >::type > option_based_list; \endcode - - Template argument list \p Options of cds::container::michael_list::make_traits metafunction are: - - opt::compare - key comparison functor. No default functor is provided. - If the option is not specified, the opt::less is used. - - opt::less - specifies binary predicate used for key comparison. Default is \p std::less. - - opt::back_off - back-off strategy used. If the option is not specified, the cds::backoff::empty is used. - - opt::item_counter - the type of item counting feature. Default is \ref atomicity::empty_item_counter that is no item counting. - - opt::allocator - the allocator used for creating and freeing list's item. Default is \ref CDS_DEFAULT_ALLOCATOR macro. - - 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::rcu_check_deadlock - a deadlock checking policy. Default is opt::v::rcu_throw_deadlock */ template < typename RCU, typename Key, typename Value, #ifdef CDS_DOXYGEN_INVOKED - typename Traits = michael_list::type_traits + typename Traits = michael_list::traits #else typename Traits #endif @@ -99,47 +87,49 @@ namespace cds { namespace container { #endif { //@cond - typedef details::make_michael_kvlist< cds::urcu::gc, Key, Value, Traits > options; - typedef typename options::type base_class; + typedef details::make_michael_kvlist< cds::urcu::gc, Key, Value, Traits > maker; + typedef typename maker::type base_class; //@endcond public: + typedef cds::urcu::gc gc; ///< Garbage collector + #ifdef CDS_DOXYGEN_INVOKED - typedef Key key_type ; ///< Key type - typedef Value mapped_type ; ///< Type of value stored in the list - typedef std::pair value_type ; ///< key/value pair stored in the list + typedef Key key_type; ///< Key type + typedef Value mapped_type; ///< Type of value stored in the list + typedef std::pair value_type; ///< key/value pair stored in the list #else - typedef typename options::key_type key_type; - typedef typename options::value_type mapped_type; - typedef typename options::pair_type value_type; + typedef typename maker::key_type key_type; + typedef typename maker::value_type mapped_type; + typedef typename maker::pair_type value_type; #endif + typedef Traits traits; ///< List traits - typedef typename base_class::gc gc ; ///< Garbage collector used - typedef typename base_class::back_off back_off ; ///< Back-off strategy used - typedef typename options::allocator_type allocator_type ; ///< Allocator type used for allocate/deallocate the nodes - typedef typename base_class::item_counter item_counter ; ///< Item counting policy used - typedef typename options::key_comparator key_comparator ; ///< key comparison functor - typedef typename base_class::memory_model memory_model ; ///< Memory ordering. See cds::opt::memory_model option + typedef typename base_class::back_off back_off; ///< Back-off strategy + typedef typename maker::allocator_type allocator_type; ///< Allocator type used for allocate/deallocate the nodes + typedef typename base_class::item_counter item_counter; ///< Item counting policy + typedef typename maker::key_comparator key_comparator; ///< key comparison functor + typedef typename base_class::memory_model memory_model; ///< Memory ordering. See \p michael_list::traits::memory_model typedef typename base_class::rcu_check_deadlock rcu_check_deadlock ; ///< RCU deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking protected: //@cond typedef typename base_class::value_type node_type; - typedef typename options::cxx_allocator cxx_allocator; - typedef typename options::node_deallocator node_deallocator; - typedef typename options::type_traits::compare intrusive_key_comparator; + typedef typename maker::cxx_allocator cxx_allocator; + typedef typename maker::node_deallocator node_deallocator; + typedef typename maker::intrusive_traits::compare intrusive_key_comparator; typedef typename base_class::atomic_node_ptr head_type; //@endcond public: /// pointer to extracted node - typedef cds::urcu::exempt_ptr< gc, node_type, value_type, typename options::type_traits::disposer, + using exempt_ptr = cds::urcu::exempt_ptr< gc, node_type, value_type, typename maker::intrusive_traits::disposer, cds::urcu::details::conventional_exempt_pair_cast - > exempt_ptr; + >; protected: //@cond @@ -293,7 +283,7 @@ namespace cds { namespace container { { return const_iterator( head() ); } - const_iterator cbegin() + const_iterator cbegin() const { return const_iterator( head() ); } @@ -305,7 +295,7 @@ namespace cds { namespace container { { return const_iterator(); } - const_iterator cend() + const_iterator cend() const { return const_iterator(); } @@ -379,8 +369,6 @@ namespace cds { namespace container { to the list's item inserted. item.second is a reference to item's value that may be changed. User-defined functor \p func should guarantee that during changing item's value no any other changes could be made on this list's item by concurrent threads. - The user-defined functor can be passed by reference using boost::ref - and it is called only if inserting is successful. The key_type should be constructible from value of type \p K. @@ -393,6 +381,8 @@ namespace cds { namespace container { it is preferable that the initialization should be completed only if inserting is successful. The function makes RCU lock internally. + + @warning See \ref cds_intrusive_item_creating "insert item troubleshooting" */ template bool insert_key( const K& key, Func func ) @@ -427,13 +417,13 @@ namespace cds { namespace container { 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. - The function makes RCU lock internally. 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 list. + + @warning See \ref cds_intrusive_item_creating "insert item troubleshooting" */ template std::pair ensure( const K& key, Func f ) @@ -476,7 +466,8 @@ namespace cds { namespace container { template bool erase_with( K const& key, Less pred ) { - return erase_at( head(), key, typename options::template less_wrapper::type() ); + CDS_UNUSED( pred ); + return erase_at( head(), key, typename maker::template less_wrapper::type() ); } /// Deletes \p key from the list @@ -490,7 +481,6 @@ namespace cds { namespace container { void operator()(value_type& val) { ... } }; \endcode - The functor may be passed by reference with boost:ref RCU \p synchronize method can be called. RCU should not be locked. @@ -514,15 +504,16 @@ namespace cds { namespace container { template bool erase_with( K const& key, Less pred, Func f ) { - return erase_at( head(), key, typename options::template less_wrapper::type(), f ); + CDS_UNUSED( pred ); + return erase_at( head(), key, typename maker::template less_wrapper::type(), f ); } /// Extracts an item from the list /** @anchor cds_nonintrusive_MichaelKVList_rcu_extract The function searches an item with key equal to \p key in the list, - unlinks it from the list, and returns pointer to an item found in \p dest argument. - If \p key is not found the function returns \p false. + unlinks it from the list, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the item found. + If \p key is not found the function returns an empty \p exempt_ptr. @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 list @@ -546,7 +537,8 @@ namespace cds { namespace container { // Now, you can apply extract function // Note that you must not delete the item found inside the RCU lock - if ( theList.extract( p, 10 )) { + p = theList.extract( 10 ); + if ( p ) { // do something with p ... } @@ -557,10 +549,9 @@ namespace cds { namespace container { \endcode */ template - bool extract( exempt_ptr& dest, K const& key ) + exempt_ptr extract( K const& key ) { - dest = extract_at( head(), key, intrusive_key_comparator() ); - return !dest.empty(); + return exempt_ptr( extract_at( head(), key, intrusive_key_comparator() )); } /// Extracts an item from the list using \p pred predicate for searching @@ -571,10 +562,10 @@ namespace cds { namespace container { \p pred must imply the same element order as \ref key_comparator. */ template - bool extract_with( exempt_ptr& dest, K const& key, Less pred ) + exempt_ptr extract_with( K const& key, Less pred ) { - dest = extract_at( head(), key, typename options::template less_wrapper::type() ); - return !dest.empty(); + CDS_UNUSED( pred ); + return exempt_ptr( extract_at( head(), key, typename maker::template less_wrapper::type() )); } /// Finds the key \p key @@ -591,7 +582,7 @@ namespace cds { namespace container { return find_at( head(), key, intrusive_key_comparator() ); } - /// 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_MichaelKVList_rcu_find_val "find(Q const&)" but \p pred is used for key comparing. @@ -601,10 +592,11 @@ namespace cds { namespace container { template bool find_with( Q const& key, Less pred ) const { - return find_at( head(), key, typename options::template less_wrapper::type() ); + CDS_UNUSED( pred ); + return find_at( head(), key, typename maker::template less_wrapper::type() ); } - /// Finds the key \p key and performs an action with it + /// Finds \p key and performs an action with it /** \anchor cds_nonintrusive_MichaelKVList_rcu_find_func The function searches an item with key equal to \p key and calls the functor \p f for the item found. The interface of \p Func functor is: @@ -615,8 +607,6 @@ namespace cds { namespace container { \endcode where \p item is the item found. - You may pass \p f argument by reference using boost::ref or cds::ref. - The functor may change item.second that is reference to value of node. Note that the function is only guarantee that \p item cannot be deleted during functor is executing. The function does not serialize simultaneous access to the list \p item. If such access is @@ -642,7 +632,8 @@ namespace cds { namespace container { template bool find_with( Q const& key, Less pred, Func f ) const { - return find_at( head(), key, typename options::template less_wrapper::type(), f ); + CDS_UNUSED( pred ); + return find_at( head(), key, typename maker::template less_wrapper::type(), f ); } /// Finds \p key and return the item found @@ -690,7 +681,8 @@ namespace cds { namespace container { template value_type * get_with( K const& key, Less pred ) const { - return get_at( head(), key, typename options::template less_wrapper::type()); + CDS_UNUSED( pred ); + return get_at( head(), key, typename maker::template less_wrapper::type() ); } /// Checks if the list is empty @@ -701,11 +693,11 @@ namespace cds { namespace container { /// Returns list's item count /** - The value returned depends on opt::item_counter option. For atomicity::empty_item_counter, + The value returned depends on item counter provided by \p Traits. For \p atomicity::empty_item_counter, this function always returns 0. - Warning: even if you use real item counter and it returns 0, this fact is not mean that the list - is empty. To check list emptyness use \ref empty() method. + @note Even if you use real item counter and it returns 0, this fact does not mean that the list + is empty. To check list emptyness use \p empty() method. */ size_t size() const { @@ -751,7 +743,7 @@ namespace cds { namespace container { { scoped_node_ptr pNode( alloc_node( key )); - if ( base_class::insert_at( refHead, *pNode, [&f](node_type& node){ cds::unref(f)( node.m_Data ); })) { + if ( base_class::insert_at( refHead, *pNode, [&f](node_type& node){ f( node.m_Data ); })) { pNode.release(); return true; } @@ -770,7 +762,7 @@ namespace cds { namespace container { scoped_node_ptr pNode( alloc_node( key )); std::pair ret = base_class::ensure_at( refHead, *pNode, - [&f]( bool bNew, node_type& node, node_type& ){ cds::unref(f)( bNew, node.m_Data ); }); + [&f]( bool bNew, node_type& node, node_type& ){ f( bNew, node.m_Data ); }); if ( ret.first && ret.second ) pNode.release(); @@ -786,7 +778,7 @@ namespace cds { namespace container { template bool erase_at( head_type& refHead, K const& key, Compare cmp, Func f ) { - return base_class::erase_at( refHead, key, cmp, [&f]( node_type const & node ){ cds::unref(f)( const_cast(node.m_Data)); }); + return base_class::erase_at( refHead, key, cmp, [&f]( node_type const & node ){ f( const_cast(node.m_Data)); }); } template @@ -804,7 +796,7 @@ namespace cds { namespace container { template bool find_at( head_type& refHead, K& key, Compare cmp, Func f ) const { - return base_class::find_at( refHead, key, cmp, [&f](node_type& node, K const&){ cds::unref(f)( node.m_Data ); }); + return base_class::find_at( refHead, key, cmp, [&f](node_type& node, K const&){ f( node.m_Data ); }); } template