X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cds%2Fintrusive%2Fstriped_set%2Fboost_slist.h;h=2d7596d8f7cfb82a65133edda321a5db4e2698c3;hb=bf833f152c06d9aadb74dec966d368cdf729d513;hp=0d8611676e8f7968a1c79f046f3941d34d9fcb92;hpb=7d15399a4d18ae2061ddb01656d85dbc940ff915;p=libcds.git diff --git a/cds/intrusive/striped_set/boost_slist.h b/cds/intrusive/striped_set/boost_slist.h index 0d861167..2d7596d8 100644 --- a/cds/intrusive/striped_set/boost_slist.h +++ b/cds/intrusive/striped_set/boost_slist.h @@ -1,7 +1,35 @@ -//$$CDS-header$$ +/* + This file is a part of libcds - Concurrent Data Structures library -#ifndef __CDS_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H -#define __CDS_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017 + + 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_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H +#define CDSLIB_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H #include #include @@ -9,218 +37,224 @@ //@cond namespace cds { namespace intrusive { namespace striped_set { - template - class adapt< boost::intrusive::slist< T, CDS_BOOST_INTRUSIVE_OPTIONS5 >, CDS_OPTIONS > - { - public: - typedef boost::intrusive::slist< T, CDS_BOOST_INTRUSIVE_OPTIONS5 > container_type ; ///< underlying intrusive container type - - private: - /// Adapted intrusive container - class adapted_container: public cds::intrusive::striped_set::adapted_sequential_container + namespace details { + template + class adapt_boost_slist { public: - typedef typename container_type::value_type value_type ; ///< value type stored in the container - typedef typename container_type::iterator iterator ; ///< container iterator - typedef typename container_type::const_iterator const_iterator ; ///< container const iterator - - typedef typename cds::opt::details::make_comparator_from_option_list< value_type, CDS_OPTIONS >::type key_comparator; + typedef List container_type; ///< underlying intrusive container type private: - - template - std::pair< iterator, bool > find_prev_item( Q const& key, Less pred ) - { - iterator itPrev = m_List.before_begin(); - iterator itEnd = m_List.end(); - for ( iterator it = m_List.begin(); it != itEnd; ++it ) { - if ( pred( key, *it ) ) - itPrev = it; - else if ( pred( *it, key ) ) - break; - else - return std::make_pair( itPrev, true ); - } - return std::make_pair( itPrev, false ); - } - - template - std::pair< iterator, bool > find_prev_item( Q const& key ) - { - return find_prev_item_cmp( key, key_comparator() ); - } - - template - std::pair< iterator, bool > find_prev_item_cmp( Q const& key, Compare cmp ) + /// Adapted intrusive container + class adapted_container : public cds::intrusive::striped_set::adapted_sequential_container { - iterator itPrev = m_List.before_begin(); - iterator itEnd = m_List.end(); - for ( iterator it = m_List.begin(); it != itEnd; ++it ) { - int nCmp = cmp( key, *it ); - if ( nCmp < 0 ) - itPrev = it; - else if ( nCmp > 0 ) - break; - else - return std::make_pair( itPrev, true ); - } - return std::make_pair( itPrev, false ); - } - - template - value_type * erase_( Q const& key, Compare cmp, Func f ) - { - std::pair< iterator, bool > pos = find_prev_item_cmp( key, cmp ); - if ( !pos.second ) - return null_ptr(); + public: + typedef typename container_type::value_type value_type; ///< value type stored in the container + typedef typename container_type::iterator iterator; ///< container iterator + typedef typename container_type::const_iterator const_iterator; ///< container const iterator + + typedef typename cds::opt::details::make_comparator_from_option_list< value_type, Options... >::type key_comparator; + + private: + + template + std::pair< iterator, bool > find_prev_item( Q const& key, Less pred ) + { + iterator itPrev = m_List.before_begin(); + iterator itEnd = m_List.end(); + for ( iterator it = m_List.begin(); it != itEnd; ++it ) { + if ( pred( key, *it )) + itPrev = it; + else if ( pred( *it, key )) + break; + else + return std::make_pair( itPrev, true ); + } + return std::make_pair( itPrev, false ); + } - // key exists - iterator it = pos.first; - value_type& val = *(++it); - cds::unref( f )( val ); - m_List.erase_after( pos.first ); + template + std::pair< iterator, bool > find_prev_item( Q const& key ) + { + return find_prev_item_cmp( key, key_comparator()); + } - return &val; - } + template + std::pair< iterator, bool > find_prev_item_cmp( Q const& key, Compare cmp ) + { + iterator itPrev = m_List.before_begin(); + iterator itEnd = m_List.end(); + for ( iterator it = m_List.begin(); it != itEnd; ++it ) { + int nCmp = cmp( key, *it ); + if ( nCmp < 0 ) + itPrev = it; + else if ( nCmp > 0 ) + break; + else + return std::make_pair( itPrev, true ); + } + return std::make_pair( itPrev, false ); + } + template + value_type * erase_( Q const& key, Compare cmp, Func f ) + { + std::pair< iterator, bool > pos = find_prev_item_cmp( key, cmp ); + if ( !pos.second ) + return nullptr; -# ifndef CDS_CXX11_LAMBDA_SUPPORT - struct empty_insert_functor { - void operator()( value_type& ) - {} - }; -# endif + // key exists + iterator it = pos.first; + value_type& val = *(++it); + f( val ); + m_List.erase_after( pos.first ); - private: - container_type m_List; + return &val; + } - public: - adapted_container() - {} + private: + container_type m_List; - container_type& base_container() - { - return m_List; - } + public: + adapted_container() + {} - template - bool insert( value_type& val, Func f ) - { - std::pair< iterator, bool > pos = find_prev_item( val ); - if ( !pos.second ) { - m_List.insert_after( pos.first, val ); - cds::unref( f )( val ); - return true; + container_type& base_container() + { + return m_List; } - // key already exists - return false; - } - - template - std::pair ensure( value_type& val, Func f ) - { - std::pair< iterator, bool > pos = find_prev_item( val ); - if ( !pos.second ) { - // insert new - m_List.insert_after( pos.first, val ); - cds::unref( f )( true, val, val ); - return std::make_pair( true, true ); + template + bool insert( value_type& val, Func f ) + { + std::pair< iterator, bool > pos = find_prev_item( val ); + if ( !pos.second ) { + m_List.insert_after( pos.first, val ); + f( val ); + return true; + } + + // key already exists + return false; } - else { - // already exists - cds::unref( f )( false, *(++pos.first), val ); - return std::make_pair( true, false ); + + template + std::pair update( value_type& val, Func f, bool bAllowInsert ) + { + std::pair< iterator, bool > pos = find_prev_item( val ); + if ( !pos.second ) { + // insert new + if ( !bAllowInsert ) + return std::make_pair( false, false ); + + m_List.insert_after( pos.first, val ); + f( true, val, val ); + return std::make_pair( true, true ); + } + else { + // already exists + f( false, *(++pos.first), val ); + return std::make_pair( true, false ); + } } - } - bool unlink( value_type& val ) - { - std::pair< iterator, bool > pos = find_prev_item( val ); - if ( !pos.second ) - return false; + bool unlink( value_type& val ) + { + std::pair< iterator, bool > pos = find_prev_item( val ); + if ( !pos.second ) + return false; - ++pos.first; - if ( &(*pos.first) != &val ) - return false; + ++pos.first; + if ( &(*pos.first) != &val ) + return false; - m_List.erase( pos.first ); - return true; - } + m_List.erase( pos.first ); + return true; + } - template - value_type * erase( Q const& key, Func f ) - { - return erase_( key, key_comparator(), f ); - } + template + value_type * erase( Q const& key, Func f ) + { + return erase_( key, key_comparator(), f ); + } - template - value_type * erase( Q const& key, Less pred, Func f ) - { - return erase_( key, cds::opt::details::make_comparator_from_less(), f ); - } + template + value_type * erase( Q const& key, Less /*pred*/, Func f ) + { + return erase_( key, cds::opt::details::make_comparator_from_less(), f ); + } - template - bool find( Q& key, Func f ) - { - std::pair< iterator, bool > pos = find_prev_item( key ); - if ( !pos.second ) - return false; + template + bool find( Q& key, Func f ) + { + std::pair< iterator, bool > pos = find_prev_item( key ); + if ( !pos.second ) + return false; - // key exists - cds::unref( f )( *(++pos.first), key ); - return true; - } + // key exists + f( *(++pos.first), key ); + return true; + } - template - bool find( Q& key, Less pred, Func f ) - { - std::pair< iterator, bool > pos = find_prev_item( key, pred ); - if ( !pos.second ) - return false; + template + bool find( Q& key, Less pred, Func f ) + { + std::pair< iterator, bool > pos = find_prev_item( key, pred ); + if ( !pos.second ) + return false; - // key exists - cds::unref( f )( *(++pos.first), key ); - return true; - } + // key exists + f( *(++pos.first), key ); + return true; + } - void clear() - { - m_List.clear(); - } + void clear() + { + m_List.clear(); + } - template - void clear( Disposer disposer ) - { - m_List.clear_and_dispose( disposer ); - } + template + void clear( Disposer disposer ) + { + m_List.clear_and_dispose( disposer ); + } - iterator begin() { return m_List.begin(); } - const_iterator begin() const { return m_List.begin(); } - iterator end() { return m_List.end(); } - const_iterator end() const { return m_List.end(); } + iterator begin() { return m_List.begin(); } + const_iterator begin() const { return m_List.begin(); } + iterator end() { return m_List.end(); } + const_iterator end() const { return m_List.end(); } - size_t size() const - { - return (size_t) m_List.size(); - } + size_t size() const + { + return (size_t)m_List.size(); + } - void move_item( adapted_container& from, iterator itWhat ) - { - value_type& val = *itWhat; - from.base_container().erase( itWhat ); -# ifdef CDS_CXX11_LAMBDA_SUPPORT - insert( val, []( value_type& ) {} ); -# else - insert( val, empty_insert_functor() ); -# endif - } + void move_item( adapted_container& from, iterator itWhat ) + { + value_type& val = *itWhat; + from.base_container().erase( itWhat ); + insert( val, []( value_type& ) {} ); + } + }; + public: + typedef adapted_container type; ///< Result of the metafunction }; - public: - typedef adapted_container type ; ///< Result of the metafunction - }; + } // namespace details + +#if CDS_COMPILER == CDS_COMPILER_INTEL && CDS_COMPILER_VERSION <= 1500 + template + class adapt< boost::intrusive::slist< T, P1, P2, P3, P4, P5 >, Options... > + : public details::adapt_boost_slist< boost::intrusive::slist< T, P1, P2, P3, P4, P5 >, Options... > + {}; +#else + template + class adapt< boost::intrusive::slist< T, BIOptions... >, Options... > + : public details::adapt_boost_slist< boost::intrusive::slist< T, BIOptions... >, Options... > + {}; +#endif + }}} // namespace cds::intrusive::striped_set //@endcond -#endif // #ifndef __CDS_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H +#endif // #ifndef CDSLIB_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H