X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cds%2Fcontainer%2Fmichael_list_rcu.h;h=4c3d502e7650b015edc154cd00f0fd92c3cd7b4f;hb=ba8f90c18cb0f1087573692b6e7aacc183233233;hp=6d8ba10286a6ab4f33a60860376bef53f3bb4796;hpb=bab1583cb2db30355c138a507943cd5ad068ccf4;p=libcds.git diff --git a/cds/container/michael_list_rcu.h b/cds/container/michael_list_rcu.h index 6d8ba102..4c3d502e 100644 --- a/cds/container/michael_list_rcu.h +++ b/cds/container/michael_list_rcu.h @@ -4,7 +4,7 @@ #define __CDS_CONTAINER_MICHAEL_LIST_RCU_H #include -#include +#include #include #include #include @@ -26,7 +26,7 @@ namespace cds { namespace container { Template arguments: - \p RCU - one of \ref cds_urcu_gc "RCU type" - \p T - type stored in the list. The type must be default- and copy-constructible. - - \p Traits - type traits, default is michael_list::type_traits + - \p Traits - type traits, default is michael_list::traits The implementation does not divide type \p T into key and value part and may be used as a main building block for hash set containers. @@ -53,8 +53,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; }; @@ -93,7 +93,7 @@ namespace cds { namespace container { typename RCU, typename T, #ifdef CDS_DOXYGEN_INVOKED - typename Traits = michael_list::type_traits + typename Traits = michael_list::traits #else typename Traits #endif @@ -106,38 +106,37 @@ namespace cds { namespace container { #endif { //@cond - typedef details::make_michael_list< cds::urcu::gc, T, Traits > options; - typedef typename options::type base_class; + typedef details::make_michael_list< cds::urcu::gc, T, Traits > maker; + typedef typename maker::type base_class; //@endcond public: - typedef T value_type ; ///< Type of value stored in the list - typedef typename base_class::gc gc ; ///< RCU schema 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 cds::urcu::gc gc; ///< RCU + typedef T value_type; ///< Type of value stored in the list + typedef Traits traits; ///< List traits + + typedef typename base_class::back_off back_off; ///< Back-off strategy used + 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 used + typedef typename maker::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::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 base_class::value_type node_type; + 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; -# ifndef CDS_CXX11_LAMBDA_SUPPORT - typedef typename base_class::empty_erase_functor empty_erase_functor; -# endif //@endcond public: - typedef cds::urcu::exempt_ptr< gc, node_type, value_type, typename options::type_traits::disposer > exempt_ptr; ///< pointer to extracted node + typedef cds::urcu::exempt_ptr< gc, node_type, value_type, typename maker::intrusive_traits::disposer > exempt_ptr; ///< pointer to extracted node private: //@cond @@ -149,78 +148,6 @@ namespace cds { namespace container { { return n.m_Value; } - -# ifndef CDS_CXX11_LAMBDA_SUPPORT - template - struct insert_functor - { - Func m_func; - - insert_functor ( Func f ) - : m_func(f) - {} - - void operator()( node_type& node ) - { - cds::unref(m_func)( node_to_value(node) ); - } - }; - - 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, node_type& node, node_type& ) - { - cds::unref(m_func)( bNew, node_to_value(node), m_arg ); - } - }; - - template - struct find_functor - { - Func m_func; - - find_functor( Func f ) - : m_func(f) - {} - - template - void operator ()( node_type& node, Q& val ) - { - cds::unref(m_func)( node_to_value(node), val ); - } - }; - - struct empty_find_functor - { - template - void operator ()( node_type& node, Q& val ) const - {} - }; - - template - struct erase_functor - { - Func m_func; - - erase_functor( Func f ) - : m_func(f) - {} - - void operator()( node_type const& node ) - { - cds::unref(m_func)( node_to_value(node) ); - } - }; -#endif // ifndef CDS_CXX11_LAMBDA_SUPPORT //@endcond protected: @@ -351,7 +278,7 @@ namespace cds { namespace container { { return const_iterator( head() ); } - const_iterator cbegin() + const_iterator cbegin() const { return const_iterator( head() ); } @@ -363,7 +290,7 @@ namespace cds { namespace container { { return const_iterator(); } - const_iterator cend() + const_iterator cend() const { return const_iterator(); } @@ -414,8 +341,6 @@ namespace cds { namespace container { The argument \p itemValue of user-defined functor \p func is the reference to the list's item inserted. 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 the inserting is success. The type \p Q should contain the complete key of the node. The object of \ref value_type should be constructible from \p key of type \p Q. @@ -429,6 +354,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( Q const& key, Func func ) @@ -461,13 +388,13 @@ 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 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( Q const& key, Func f ) @@ -475,7 +402,7 @@ namespace cds { namespace container { return ensure_at( head(), key, f ); } - /// Inserts data of type \ref value_type constructed with std::forward(args)... + /// Inserts data of type \ref value_type constructed from \p args /** Returns \p true if inserting successful, \p false otherwise. @@ -489,10 +416,10 @@ namespace cds { namespace container { /// Deletes \p key from the list /** \anchor cds_nonintrusive_MichealList_rcu_erase_val - Since the key of MichaelList's item type \p T is not explicitly specified, + Since the key of MichaelList's item type \p value_type is not explicitly specified, template parameter \p Q defines the key type searching in the list. - The list item comparator should be able to compare the type \p T of list item - and the value \p key of type \p Q. + The list item comparator should be able to compare values of the type \p value_type + and \p Q in any order. RCU \p synchronize method can be called. RCU should not be locked. @@ -501,11 +428,7 @@ namespace cds { namespace container { template bool erase( Q const& key ) { -# ifdef CDS_CXX11_LAMBDA_SUPPORT return erase_at( head(), key, intrusive_key_comparator(), [](value_type const&){} ); -# else - return erase_at( head(), key, intrusive_key_comparator(), empty_erase_functor() ); -# endif } /// Deletes the item from the list using \p pred predicate for searching @@ -518,11 +441,7 @@ namespace cds { namespace container { template bool erase_with( Q const& key, Less pred ) { -# ifdef CDS_CXX11_LAMBDA_SUPPORT - return erase_at( head(), key, typename options::template less_wrapper::type(), [](value_type const&){} ); -# else - return erase_at( head(), key, typename options::template less_wrapper::type(), empty_erase_functor() ); -# endif + return erase_at( head(), key, typename maker::template less_wrapper::type(), [](value_type const&){} ); } /// Deletes \p key from the list @@ -536,12 +455,11 @@ namespace cds { namespace container { void operator()(const value_type& val) { ... } }; \endcode - The functor may be passed by reference with boost:ref - Since the key of MichaelList's item type \p T is not explicitly specified, + Since the key of MichaelList's item type \p value_type is not explicitly specified, template parameter \p Q defines the key type searching in the list. - The list item comparator should be able to compare the type \p T of list item - and the type \p Q. + The list item comparator should be able to compare the values of type \p value_type + and \p Q in any order. RCU \p synchronize method can be called. RCU should not be locked. @@ -563,15 +481,15 @@ namespace cds { namespace container { template bool erase_with( Q const& key, Less pred, Func f ) { - return erase_at( head(), key, typename options::template less_wrapper::type(), f ); + return erase_at( head(), key, typename maker::template less_wrapper::type(), f ); } /// Extracts an item from the list /** @anchor cds_nonintrusive_MichaelList_rcu_extract - The function searches an item with key equal to \p val in the list, + 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 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 list @@ -606,9 +524,9 @@ namespace cds { namespace container { \endcode */ template - bool extract( exempt_ptr& dest, Q const& val ) + bool extract( exempt_ptr& dest, Q const& key ) { - dest = extract_at( head(), val, intrusive_key_comparator() ); + dest = extract_at( head(), key, intrusive_key_comparator() ); return !dest.empty(); } @@ -621,9 +539,9 @@ namespace cds { namespace container { \p pred must imply the same element order as \ref key_comparator. */ template - bool extract_with( exempt_ptr& dest, Q const& val, Less pred ) + bool extract_with( exempt_ptr& dest, Q const& key, Less pred ) { - dest = extract_at( head(), val, typename options::template less_wrapper::type() ); + dest = extract_at( head(), key, typename maker::template less_wrapper::type() ); return !dest.empty(); } @@ -650,41 +568,36 @@ 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() ); + return find_at( head(), key, typename maker::template less_wrapper::type() ); } - /// Finds the key \p val and performs an action with it + /// Finds the key \p key and performs an action with it /** \anchor cds_nonintrusive_MichaelList_rcu_find_func - The function searches an item with key equal to \p val and calls the functor \p f for the item found. + 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: \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 \p %find() function argument. The functor may change non-key fields of \p item. 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 possible you must provide your own synchronization schema 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. - The function makes RCU lock internally. The function returns \p true if \p val is found, \p false otherwise. */ template - bool find( Q& val, Func f ) const + bool find( Q& key, Func f ) const { - return find_at( head(), val, intrusive_key_comparator(), f ); + return find_at( head(), key, intrusive_key_comparator(), f ); } - /// Finds the key \p val using \p pred predicate for searching + /// Finds the key \p key using \p pred predicate for searching /** The function is an analog of \ref cds_nonintrusive_MichaelList_rcu_find_func "find(Q&, Func)" but \p pred is used for key comparing. @@ -692,56 +605,15 @@ namespace cds { namespace container { \p pred must imply the same element order as the comparator used for building the list. */ template - bool find_with( Q& val, Less pred, Func f ) const - { - return find_at( head(), val, typename options::template less_wrapper::type(), f ); - } - - /// Finds the key \p val and performs an action with it - /** \anchor cds_nonintrusive_MichaelList_rcu_find_cfunc - The function searches an item with key equal to \p val and calls the functor \p f for the 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 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 - possible you must provide your own synchronization schema to exclude unsafe item modifications. - - The function makes 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 - { - return find_at( head(), val, intrusive_key_comparator(), f ); - } - - /// Finds the key \p val using \p pred predicate for searching - /** - The function is an analog of \ref cds_nonintrusive_MichaelList_rcu_find_cfunc "find(Q&, Func)" - but \p pred is used for key comparing. - \p Less functor has the interface like \p std::less. - \p pred must imply the same element order as the comparator used for building the list. - */ - template - bool find_with( Q const& val, Less pred, Func f ) const + bool find_with( Q& key, Less pred, Func f ) const { - return find_at( head(), val, typename options::template less_wrapper::type(), f ); + return find_at( head(), key, typename maker::template less_wrapper::type(), f ); } - /// Finds the key \p val and return the item found + /// Finds the key \p key and return the item found /** \anchor cds_nonintrusive_MichaelList_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. @@ -766,12 +638,12 @@ namespace cds { namespace container { \endcode */ template - value_type * get( Q const& val ) const + value_type * get( Q const& key ) const { - return get_at( head(), val, intrusive_key_comparator()); + return get_at( head(), key, intrusive_key_comparator()); } - /// Finds the key \p val and return the item found + /// Finds \p key and return the item found /** The function is an analog of \ref cds_nonintrusive_MichaelList_rcu_get "get(Q const&)" but \p pred is used for comparing the keys. @@ -781,9 +653,9 @@ namespace cds { namespace container { \p pred must imply the same element order as the comparator used for building the list. */ template - value_type * get_with( Q const& val, Less pred ) const + value_type * get_with( Q const& key, Less pred ) const { - return get_at( head(), val, typename options::template less_wrapper::type()); + return get_at( head(), key, typename maker::template less_wrapper::type()); } /// Checks if the list is empty @@ -794,11 +666,11 @@ namespace cds { namespace container { /// Returns list's item count /** - The value returned depends on opt::item_counter option. For atomics::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 a 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 { @@ -806,9 +678,6 @@ namespace cds { namespace container { } /// Clears the list - /** - Post-condition: the list is empty - */ void clear() { base_class::clear(); @@ -839,20 +708,7 @@ namespace cds { namespace container { { scoped_node_ptr pNode( alloc_node( key )); -# ifdef CDS_CXX11_LAMBDA_SUPPORT -# ifdef CDS_BUG_STATIC_MEMBER_IN_LAMBDA - // GCC 4.5,4.6,4.7: node_to_value is unaccessible from lambda, - // like as MichaelList::node_to_value that requires to capture *this* despite on node_to_value is static function - value_type& (* n2v)( node_type& ) = node_to_value; - if ( base_class::insert_at( refHead, *pNode, [&f, n2v]( node_type& node ) { cds::unref(f)( n2v(node) ); } )) -# else - if ( base_class::insert_at( refHead, *pNode, [&f]( node_type& node ) { cds::unref(f)( node_to_value(node) ); } )) -# endif -# else - insert_functor wrapper( f ); - if ( base_class::insert_at( refHead, *pNode, cds::ref(wrapper) )) -# endif - { + if ( base_class::insert_at( refHead, *pNode, [&f]( node_type& node ) { f( node_to_value(node) ); } )) { pNode.release(); return true; } @@ -868,19 +724,7 @@ namespace cds { namespace container { template bool erase_at( head_type& refHead, Q const& key, Compare cmp, Func f ) { -# ifdef CDS_CXX11_LAMBDA_SUPPORT -# ifdef CDS_BUG_STATIC_MEMBER_IN_LAMBDA - // GCC 4.5-4.7: node_to_value is unaccessible from lambda, - // like as MichaelList::node_to_value that requires to capture *this* despite on node_to_value is static function - value_type const& (* n2v)( node_type const& ) = node_to_value; - return base_class::erase_at( refHead, key, cmp, [&f,n2v](node_type const& node){ cds::unref(f)( n2v(node) ); } ); -# else - return base_class::erase_at( refHead, key, cmp, [&f](node_type const& node){ cds::unref(f)( node_to_value(node) ); } ); -# endif -# else - erase_functor wrapper( f ); - return base_class::erase_at( refHead, key, cmp, cds::ref(wrapper) ); -# endif + return base_class::erase_at( refHead, key, cmp, [&f](node_type const& node){ f( node_to_value(node) ); } ); } template @@ -888,21 +732,8 @@ namespace cds { namespace container { { scoped_node_ptr pNode( alloc_node( key )); -# ifdef CDS_CXX11_LAMBDA_SUPPORT -# ifdef CDS_BUG_STATIC_MEMBER_IN_LAMBDA - // GCC 4.5-4.7: node_to_value is unaccessible from lambda, - // like as MichaelList::node_to_value that requires to capture *this* despite on node_to_value is static function - value_type& (* n2v)( node_type& ) = node_to_value; - std::pair ret = base_class::ensure_at( refHead, *pNode, - [&f, &key, n2v](bool bNew, node_type& node, node_type&){ cds::unref(f)( bNew, n2v(node), key ); }); -# else std::pair ret = base_class::ensure_at( refHead, *pNode, - [&f, &key](bool bNew, node_type& node, node_type&){ cds::unref(f)( bNew, node_to_value(node), key ); }); -# endif -# else - ensure_functor wrapper( key, f ); - std::pair ret = base_class::ensure_at( refHead, *pNode, cds::ref(wrapper)); -# endif + [&f, &key](bool bNew, node_type& node, node_type&){ f( bNew, node_to_value(node), key ); }); if ( ret.first && ret.second ) pNode.release(); @@ -918,29 +749,13 @@ namespace cds { namespace container { template bool find_at( head_type& refHead, Q const& key, Compare cmp ) const { -# ifdef CDS_CXX11_LAMBDA_SUPPORT return base_class::find_at( refHead, key, cmp, [](node_type&, Q const &) {} ); -# else - return base_class::find_at( refHead, key, cmp, empty_find_functor() ); -# endif } template bool find_at( head_type& refHead, Q& val, Compare cmp, Func f ) const { -# ifdef CDS_CXX11_LAMBDA_SUPPORT -# ifdef CDS_BUG_STATIC_MEMBER_IN_LAMBDA - // GCC 4.5-4.7: node_to_value is unaccessible from lambda, - // like as MichaelList::node_to_value that requires to capture *this* despite on node_to_value is static function - value_type& (* n2v)( node_type& ) = node_to_value; - return base_class::find_at( refHead, val, cmp, [&f, n2v](node_type& node, Q& v){ cds::unref(f)( n2v(node), v ); }); -# else - return base_class::find_at( refHead, val, cmp, [&f](node_type& node, Q& v){ cds::unref(f)( node_to_value(node), v ); }); -# endif -# else - find_functor wrapper( f ); - return base_class::find_at( refHead, val, cmp, cds::ref(wrapper) ); -# endif + return base_class::find_at( refHead, val, cmp, [&f](node_type& node, Q& v){ f( node_to_value(node), v ); }); } template