//$$CDS-header$$
-#ifndef __CDS_INTRUSIVE_STRIPED_SET_ADAPTER_H
-#define __CDS_INTRUSIVE_STRIPED_SET_ADAPTER_H
+#ifndef CDSLIB_INTRUSIVE_STRIPED_SET_ADAPTER_H
+#define CDSLIB_INTRUSIVE_STRIPED_SET_ADAPTER_H
#include <cds/opt/options.h>
#include <cds/intrusive/striped_set/resizing_policy.h>
#include <cds/opt/hash.h>
#include <cds/opt/compare.h> // cds::opt::details::make_comparator - for some adapt specializations
-#include <cds/ref.h>
namespace cds { namespace intrusive {
/// StripedSet related definitions
namespace striped_set {
-
/// Default adapter for intrusive striped/refinable hash set
/**
By default, the metafunction does not make any transformation for container type \p Container.
\p Container should provide interface suitable for the hash set.
- The \p SetOptions template argument contains option pack
- that has been passed to cds::intrusive::StripedSet.
+ The \p Options template argument contains option pack
+ that will be passed to \p cds::intrusive::StripedSet.
<b>Bucket interface</b>
\endcode
where \p item is the item inserted.
- The user-defined functor \p f is called only if the inserting is success. It can be passed by reference
- using <tt>boost::ref</tt>
+ The user-defined functor \p f is called only if the inserting is success.
<hr>
- <b>Ensures that the \p item exists in the container</b>
- \code template <typename Func> std::pair<bool, bool> ensure( value_type& val, Func f ) \endcode
+ <b>Updates the item in the container</b>
+ \code template <typename Func> std::pair<bool, bool> update( value_type& val, Func f, bool bAllowInsert = true ) \endcode
The operation performs inserting or changing data.
- If the \p val key not found in the container, then \p val is inserted.
+ If the \p val key not found in the container, then \p val is inserted iff \p bAllowInsert is \p true.
Otherwise, the functor \p f is called with the item found.
The \p Func functor has the following interface:
where arguments are:
- \p bNew - \p true if the item has been inserted, \p false otherwise
- \p item - container's item
- - \p val - argument \p val passed into the \p ensure function
+ - \p val - argument \p val passed into the \p update() function
If \p val has been inserted (i.e. <tt>bNew == true</tt>) then \p item and \p val
are the same element: <tt>&item == &val</tt>. Otherwise, they are different.
The functor can change non-key fields of the \p item.
- You can pass \p f argument by reference using <tt>boost::ref</tt>.
-
Returns <tt> std::pair<bool, bool> </tt> 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 val key
already exists.
void operator()(value_type& val);
};
\endcode
- The functor can be passed by reference using <tt>boost:ref</tt>
The type \p Q can differ from \ref value_type of items storing in the container.
Therefore, the \p value_type should be comparable with type \p Q.
\endcode
where \p item is the item found, \p val is the <tt>find</tt> function argument.
- You can pass \p f argument by reference using <tt>boost::ref</tt> or cds::ref.
-
The functor can change non-key fields of \p item.
The \p val argument may be non-const since it can be used as \p f functor destination i.e., the functor
can modify both arguments.
<hr>
*/
- template < typename Container, CDS_DECL_OPTIONS >
+ template < typename Container, typename... Options >
class adapt
{
public:
typedef typename container_type::value_compare key_comparator;
private:
-# ifndef CDS_CXX11_LAMBDA_SUPPORT
- struct empty_insert_functor {
- void operator()( value_type& )
- {}
- };
-# endif
-
container_type m_Set;
public:
{
std::pair<iterator, bool> res = m_Set.insert( val );
if ( res.second )
- cds::unref(f)( val );
+ f( val );
return res.second;
}
template <typename Func>
- std::pair<bool, bool> ensure( value_type& val, Func f )
+ std::pair<bool, bool> update( value_type& val, Func f, bool bAllowInsert )
{
- std::pair<iterator, bool> res = m_Set.insert( val );
- cds::unref(f)( res.second, *res.first, val );
- return std::make_pair( true, res.second );
+ if ( bAllowInsert ) {
+ std::pair<iterator, bool> res = m_Set.insert( val );
+ f( res.second, *res.first, val );
+ return std::make_pair( true, res.second );
+ }
+ else {
+ auto it = m_Set.find( val );
+ if ( it == m_Set.end() )
+ return std::make_pair( false, false );
+ f( false, *it, val );
+ return std::make_pair( true, false );
+ }
}
bool unlink( value_type& val )
{
- iterator it = m_Set.find( value_type(val) );
+ iterator it = m_Set.find( value_type(val));
if ( it == m_Set.end() || &(*it) != &val )
return false;
m_Set.erase( it );
if (it == m_Set.end())
return nullptr;
value_type& val = *it;
- cds::unref(f)( val );
+ f( val );
m_Set.erase( it );
return &val;
}
if (it == m_Set.end())
return nullptr;
value_type& val = *it;
- cds::unref(f)( val );
+ f( val );
m_Set.erase( it );
return &val;
}
iterator it = m_Set.find( key, cmp );
if ( it == m_Set.end() )
return false;
- cds::unref(f)( *it, key );
+ f( *it, key );
return true;
}
{
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
}
};
} // namespace details
} // namespace striped_set
}} // namespace cds::intrusive
-//@cond
-#if defined(CDS_CXX11_VARIADIC_TEMPLATE_SUPPORT) && defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS3 typename... BIOptions
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS4 typename... BIOptions
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS5 typename... BIOptions
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS6 typename... BIOptions
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS7 typename... BIOptions
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS8 typename... BIOptions
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS9 typename... BIOptions
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS10 typename... BIOptions
-
-# define CDS_BOOST_INTRUSIVE_OPTIONS3 BIOptions...
-# define CDS_BOOST_INTRUSIVE_OPTIONS4 BIOptions...
-# define CDS_BOOST_INTRUSIVE_OPTIONS5 BIOptions...
-# define CDS_BOOST_INTRUSIVE_OPTIONS6 BIOptions...
-# define CDS_BOOST_INTRUSIVE_OPTIONS7 BIOptions...
-# define CDS_BOOST_INTRUSIVE_OPTIONS8 BIOptions...
-# define CDS_BOOST_INTRUSIVE_OPTIONS9 BIOptions...
-# define CDS_BOOST_INTRUSIVE_OPTIONS10 BIOptions...
-#else
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS3 typename BIO1, typename BIO2, typename BIO3
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS4 CDS_BOOST_INTRUSIVE_DECL_OPTIONS3, typename BIO4
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS5 CDS_BOOST_INTRUSIVE_DECL_OPTIONS4, typename BIO5
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS6 CDS_BOOST_INTRUSIVE_DECL_OPTIONS5, typename BIO6
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS7 CDS_BOOST_INTRUSIVE_DECL_OPTIONS6, typename BIO7
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS8 CDS_BOOST_INTRUSIVE_DECL_OPTIONS7, typename BIO8
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS9 CDS_BOOST_INTRUSIVE_DECL_OPTIONS8, typename BIO9
-# define CDS_BOOST_INTRUSIVE_DECL_OPTIONS10 CDS_BOOST_INTRUSIVE_DECL_OPTIONS9, typename BIO10
-
-# define CDS_BOOST_INTRUSIVE_OPTIONS3 BIO1,BIO2,BIO3
-# define CDS_BOOST_INTRUSIVE_OPTIONS4 CDS_BOOST_INTRUSIVE_OPTIONS3, BIO4
-# define CDS_BOOST_INTRUSIVE_OPTIONS5 CDS_BOOST_INTRUSIVE_OPTIONS4, BIO5
-# define CDS_BOOST_INTRUSIVE_OPTIONS6 CDS_BOOST_INTRUSIVE_OPTIONS5, BIO6
-# define CDS_BOOST_INTRUSIVE_OPTIONS7 CDS_BOOST_INTRUSIVE_OPTIONS6, BIO7
-# define CDS_BOOST_INTRUSIVE_OPTIONS8 CDS_BOOST_INTRUSIVE_OPTIONS7, BIO8
-# define CDS_BOOST_INTRUSIVE_OPTIONS9 CDS_BOOST_INTRUSIVE_OPTIONS8, BIO9
-# define CDS_BOOST_INTRUSIVE_OPTIONS10 CDS_BOOST_INTRUSIVE_OPTIONS9, BIO10
-#endif
-//@endcond
-
-#endif // #ifndef __CDS_INTRUSIVE_STRIPED_SET_ADAPTER_H
+#endif // #ifndef CDSLIB_INTRUSIVE_STRIPED_SET_ADAPTER_H
projects / libcds.git / blobdiff