X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=cds%2Fcontainer%2Fstriped_set%2Fboost_list.h;h=e3d39d51a0d964c7a568de1ba25e6925fac26087;hp=8dad1316df0434ba33e385a4fa294089ebc1ff3b;hb=2bb66f1d159d044d2c5dad0f0f968abcb6d53287;hpb=abe9634d97a9fece9abe5b0cfc78dc62f62f08c8 diff --git a/cds/container/striped_set/boost_list.h b/cds/container/striped_set/boost_list.h index 8dad1316..e3d39d51 100644 --- a/cds/container/striped_set/boost_list.h +++ b/cds/container/striped_set/boost_list.h @@ -1,17 +1,45 @@ -//$$CDS-header$$ +/* + This file is a part of libcds - Concurrent Data Structures library -#ifndef __CDS_CONTAINER_STRIPED_SET_BOOST_LIST_ADAPTER_H -#define __CDS_CONTAINER_STRIPED_SET_BOOST_LIST_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_CONTAINER_STRIPED_SET_BOOST_LIST_ADAPTER_H +#define CDSLIB_CONTAINER_STRIPED_SET_BOOST_LIST_ADAPTER_H #include #if BOOST_VERSION < 104800 # error "For boost::container::list you must use boost 1.48 or above" #endif +#include // std::lower_bound +#include // ref #include -#include #include -#include // std::lower_bound //@cond namespace cds { namespace container { @@ -54,7 +82,7 @@ namespace cds { namespace container { void operator()( list_type& list, iterator itInsert, iterator itWhat ) { - list.insert( itInsert, std::move( *itWhat ) ); + list.insert( itInsert, std::move( *itWhat )); } }; } // namespace striped_set @@ -130,11 +158,11 @@ namespace cds { namespace intrusive { namespace striped_set { template bool insert( Q const& val, Func f ) { - iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate() ); + iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate()); if ( it == m_List.end() || key_comparator()( val, *it ) != 0 ) { value_type newItem( val ); it = m_List.insert( it, newItem ); - cds::unref( f )( *it ); + f( *it ); return true; } @@ -147,28 +175,31 @@ namespace cds { namespace intrusive { namespace striped_set { bool emplace( Args&&... args ) { value_type val( std::forward(args)... ); - iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate() ); + iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate()); if ( it == m_List.end() || key_comparator()( val, *it ) != 0 ) { - m_List.emplace( it, std::move( val ) ); + m_List.emplace( it, std::move( val )); return true; } return false; } template - std::pair ensure( Q const& val, Func func ) + std::pair update( Q const& val, Func func, bool bAllowInsert ) { - iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate() ); + iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate()); if ( it == m_List.end() || key_comparator()( val, *it ) != 0 ) { // insert new + if ( !bAllowInsert ) + return std::make_pair( false, false ); + value_type newItem( val ); it = m_List.insert( it, newItem ); - cds::unref( func )( true, *it, val ); + func( true, *it, val ); return std::make_pair( true, true ); } else { // already exists - cds::unref( func )( false, *it, val ); + func( false, *it, val ); return std::make_pair( true, false ); } } @@ -176,12 +207,12 @@ namespace cds { namespace intrusive { namespace striped_set { template bool erase( Q const& key, Func f ) { - iterator it = std::lower_bound( m_List.begin(), m_List.end(), key, find_predicate() ); + iterator it = std::lower_bound( m_List.begin(), m_List.end(), key, find_predicate()); if ( it == m_List.end() || key_comparator()( key, *it ) != 0 ) return false; // key exists - cds::unref( f )( *it ); + f( *it ); m_List.erase( it ); return true; @@ -191,11 +222,11 @@ namespace cds { namespace intrusive { namespace striped_set { bool erase( Q const& key, Less pred, Func f ) { iterator it = std::lower_bound( m_List.begin(), m_List.end(), key, pred ); - if ( it == m_List.end() || pred( key, *it ) || pred( *it, key ) ) + if ( it == m_List.end() || pred( key, *it ) || pred( *it, key )) return false; // key exists - cds::unref( f )( *it ); + f( *it ); m_List.erase( it ); return true; @@ -204,12 +235,12 @@ namespace cds { namespace intrusive { namespace striped_set { template bool find( Q& val, Func f ) { - iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate() ); + iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, find_predicate()); if ( it == m_List.end() || key_comparator()( val, *it ) != 0 ) return false; // key exists - cds::unref( f )( *it, val ); + f( *it, val ); return true; } @@ -217,11 +248,11 @@ namespace cds { namespace intrusive { namespace striped_set { bool find( Q& val, Less pred, Func f ) { iterator it = std::lower_bound( m_List.begin(), m_List.end(), val, pred ); - if ( it == m_List.end() || pred( val, *it ) || pred( *it, val ) ) + if ( it == m_List.end() || pred( val, *it ) || pred( *it, val )) return false; // key exists - cds::unref( f )( *it, val ); + f( *it, val ); return true; } @@ -238,7 +269,7 @@ namespace cds { namespace intrusive { namespace striped_set { void move_item( adapted_container& /*from*/, iterator itWhat ) { - iterator it = std::lower_bound( m_List.begin(), m_List.end(), *itWhat, find_predicate() ); + iterator it = std::lower_bound( m_List.begin(), m_List.end(), *itWhat, find_predicate()); assert( it == m_List.end() || key_comparator()( *itWhat, *it ) != 0 ); copy_item()( m_List, it, itWhat ); @@ -257,4 +288,4 @@ namespace cds { namespace intrusive { namespace striped_set { }}} // namespace cds::intrsive::striped_set //@endcond -#endif // #ifndef __CDS_CONTAINER_STRIPED_SET_BOOST_LIST_ADAPTER_H +#endif // #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_LIST_ADAPTER_H