intrusive::SplitListSet refactoring

diff --git a/cds/intrusive/details/split_list_base.h b/cds/intrusive/details/split_list_base.h
index fd98568be5d9a2bc6797dc989b00b800c9caef95..e286e474beb279cfbe0cf77ef14dbe071ddeccd5 100644 (file)
--- a/cds/intrusive/details/split_list_base.h
+++ b/cds/intrusive/details/split_list_base.h
@@ -50,27 +50,108 @@ namespace cds { namespace intrusive {
             }
         };
 
             }
         };
 

+        /// SplitListSet internal statistics. May be used for debugging or profiling
+        /**
+            Template argument \p Counter defines type of counter.
+            Default is \p cds::atomicity::event_counter, that is weak, i.e. it is not guaranteed
+            strict event counting.
+            You may use stronger type of counter like as \p cds::atomicity::item_counter,
+            or even integral type, for example, \p int.
+        */
+        template <typename Counter = cds::atomicity::event_counter >
+        struct stat
+        {
+            typedef Counter     counter_type;   ///< Counter type
+
+            counter_type    m_nInsertSuccess;        ///< Count of success inserting
+            counter_type    m_nInsertFailed;         ///< Count of failed inserting
+            counter_type    m_nEnsureNew;            ///< Count of new item created by \p ensure() member function
+            counter_type    m_nEnsureExist;          ///< Count of \p ensure() call for existing item
+            counter_type    m_nEraseSuccess;         ///< Count of success erasing of items
+            counter_type    m_nEraseFailed;          ///< Count of attempts to erase unknown item
+            counter_type    m_nExtractSuccess;       ///< Count of success extracting of items
+            counter_type    m_nExtractFailed;        ///< Count of attempts to extract unknown item
+            counter_type    m_nFindSuccess;          ///< Count of success finding
+            counter_type    m_nFindFailed;           ///< Count of failed finding
+            counter_type    m_nHeadNodeAllocated;    ///< Count of allocated head node
+            counter_type    m_nHeadNodeFreed;        ///< Count of freed head node
+            counter_type    m_nBucketCount;          ///< Current bucket count
+            counter_type    m_nInitBucketRecursive;  ///< Count of recursive bucket initialization
+            counter_type    m_nInitBucketContention; ///< Count of bucket init contention encountered
+            counter_type    m_nBusyWaitBucketInit;   ///< Count of busy wait cycle while a bucket is initialized
+
+            //@cond
+            void onInsertSuccess()       { ++m_nInsertSuccess; }
+            void onInsertFailed()        { ++m_nInsertFailed; }
+            void onEnsureNew()           { ++m_nEnsureNew; }
+            void onEnsureExist()         { ++m_nEnsureExist; }
+            void onEraseSuccess()        { ++m_nEraseSuccess; }
+            void onEraseFailed()         { ++m_nEraseFailed; }
+            void onExtractSuccess()      { ++m_nExtractSuccess; }
+            void onExtractFailed()       { ++m_nExtractFailed; }
+            void onFindSuccess()         { ++m_nFindSuccess; }
+            void onFindFailed()          { ++m_nFindFailed; }
+            bool onFind(bool bSuccess) 
+            { 
+                if ( bSuccess )
+                    onFindSuccess();
+                else
+                    onFindFailed();
+                return bSuccess;
+            }
+            void onHeadNodeAllocated()   { ++m_nHeadNodeAllocated; }
+            void onHeadNodeFreed()       { ++m_nHeadNodeFreed; }
+            void onNewBucket()           { ++m_nBucketCount; }
+            void onRecursiveInitBucket() { ++m_nInitBucketRecursive; }
+            void onBucketInitContenton() { ++m_nInitBucketContention; }
+            void onBusyWaitBucketInit()  { ++m_nBusyWaitBucketInit; }
+            //@endcond
+        };

 
 

-        /// Type traits for SplitListSet class
-        struct type_traits {
+        /// Dummy queue statistics - no counting is performed, no overhead. Support interface like \p split_list::stat
+        struct empty_stat {
+            //@cond
+            void onInsertSuccess()       const {}
+            void onInsertFailed()        const {}
+            void onEnsureNew()           const {}
+            void onEnsureExist()         const {}
+            void onEraseSuccess()        const {}
+            void onEraseFailed()         const {}
+            void onExtractSuccess()      const {}
+            void onExtractFailed()       const {}
+            void onFindSuccess()         const {}
+            void onFindFailed()          const {}
+            bool onFind( bool bSuccess ) const { return bSuccess; }
+            void onHeadNodeAllocated()   const {}
+            void onHeadNodeFreed()       const {}
+            void onNewBucket()           const {}
+            void onRecursiveInitBucket() const {}
+            void onBucketInitContenton() const {}
+            void onBusyWaitBucketInit()  const {}
+            //@endcond
+        };
+
+        /// SplitListSet traits
+        struct traits
+        {

             /// Hash function
             /**
                 Hash function converts the key fields of struct \p T stored in the split list
             /// Hash function
             /**
                 Hash function converts the key fields of struct \p T stored in the split list

-                into value of type \p size_t called hash value that is an index of hash table.
+                into hash value of type \p size_t that is an index in hash table.

 
 

-                This is mandatory type and has no predefined one.
+                Hash typedef is mandatory and has no predefined one.

             */
             typedef opt::none       hash;
 
             /// Item counter
             /**
             */
             typedef opt::none       hash;
 
             /// Item counter
             /**

-                The item counting is an important part of SplitListSet algorithm:
+                The item counting is an important part of \p SplitListSet algorithm:

                 the <tt>empty()</tt> member function depends on correct item counting.
                 the <tt>empty()</tt> member function depends on correct item counting.

-                Therefore, atomicity::empty_item_counter is not allowed as a type of the option.
+                Therefore, \p cds::atomicity::empty_item_counter is not allowed as a type of the option.

 
 

-                Default is atomicity::item_counter.
+                Default is \p cds::atomicity::item_counter.

             */
             */

-            typedef atomicity::item_counter item_counter;
+            typedef cds::atomicity::item_counter item_counter;

 
             /// Bucket table allocator
             /**
 
             /// Bucket table allocator
             /**


@@ -78,35 +159,43 @@ namespace cds { namespace intrusive {
             */
             typedef CDS_DEFAULT_ALLOCATOR   allocator;
 
             */
             typedef CDS_DEFAULT_ALLOCATOR   allocator;
 

-            /// C++ memory model for atomic operations
+            /// Internal statistics (by default, disabled)

             /**
             /**

-                Can be opt::v::relaxed_ordering (relaxed memory model, the default) or opt::v::sequential_consistent (sequentially consisnent memory model).
+                Possible statistics types are: \p split_list::stat (enable internal statistics), 
+                \p split_list::empty_stat (the default, internal statistics disabled),
+                user-provided class that supports \p %split_list::stat interface.
+            */
+            typedef split_list::empty_stat  stat;
+
+
+            /// C++ memory ordering model
+            /** 
+                Can be \p opt::v::relaxed_ordering (relaxed memory model, the default)
+                or \p opt::v::sequential_consistent (sequentially consisnent memory model).

             */
             */

-            typedef opt::v::relaxed_ordering    memory_model;
+            typedef opt::v::relaxed_ordering memory_model;

 
             /// What type of bucket table is used
             /**
 
             /// What type of bucket table is used
             /**

-                \p true - use split_list::expandable_bucket_table that can be expanded
-                    if the load factor of the set is exhausted
-                \p false - use split_list::static_bucket_table that cannot be expanded
+                \p true - use \p split_list::expandable_bucket_table that can be expanded
+                    if the load factor of the set is exhausted.
+                \p false - use \p split_list::static_bucket_table that cannot be expanded
+                    and is allocated in \p SplitListSet constructor.

 
                 Default is \p true.
             */
             static const bool dynamic_bucket_table = true;
 
 
                 Default is \p true.
             */
             static const bool dynamic_bucket_table = true;
 

-            /// back-off strategy used
-            /**
-                If the option is not specified, the cds::backoff::Default is used.
-            */
-            typedef cds::backoff::Default             back_off;
+            /// Back-off strategy
+            typedef cds::backoff::Default back_off;

         };
 
         /// [value-option] Split-list dynamic bucket table option
         /**
             The option is used to select bucket table implementation.
             Possible values of \p Value are:
         };
 
         /// [value-option] Split-list dynamic bucket table option
         /**
             The option is used to select bucket table implementation.
             Possible values of \p Value are:

-            - \p true - select \ref expandable_bucket_table implementation
-            - \p false - select \ref static_bucket_table implementation
+            - \p true - select \p expandable_bucket_table
+            - \p false - select \p static_bucket_table

         */
         template <bool Value>
         struct dynamic_bucket_table
         */
         template <bool Value>
         struct dynamic_bucket_table


@@ -119,42 +208,38 @@ namespace cds { namespace intrusive {
             //@endcond
         };
 
             //@endcond
         };
 

-        /// Metafunction converting option list to traits struct
+        /// Metafunction converting option list to \p split_list::traits

         /**
         /**

-            This is a wrapper for <tt> cds::opt::make_options< type_traits, Options...> </tt>
-

             Available \p Options:
             Available \p Options:

-            - opt::hash - mandatory option, specifies hash functor.
-            - opt::item_counter - optional, specifies item counting policy. See type_traits::item_counter
+            - \p opt::hash - mandatory option, specifies hash functor.
+            - \p opt::item_counter - optional, specifies item counting policy. See \p traits::item_counter

                 for default type.
                 for default type.

-            - opt::memory_model - C++ memory model for atomic operations.
-                Can be opt::v::relaxed_ordering (relaxed memory model, the default) or opt::v::sequential_consistent (sequentially consisnent memory model).
-            - opt::allocator - optional, bucket table allocator. Default is \ref CDS_DEFAULT_ALLOCATOR.
-            - split_list::dynamic_bucket_table - use dynamic or static bucket table implementation.
+            - \p opt::memory_model - C++ memory model for atomic operations.
+                Can be \p opt::v::relaxed_ordering (relaxed memory model, the default) 
+                or \p opt::v::sequential_consistent (sequentially consisnent memory model).
+            - \p opt::allocator - optional, bucket table allocator. Default is \ref CDS_DEFAULT_ALLOCATOR.
+            - \p split_list::dynamic_bucket_table - use dynamic or static bucket table implementation.

                 Dynamic bucket table expands its size up to maximum bucket count when necessary
                 Dynamic bucket table expands its size up to maximum bucket count when necessary

-            - opt::back_off - back-off strategy used for spinning. If the option is not specified, the cds::backoff::Default is used.
-
-            See \ref MichaelHashSet, \ref type_traits.
+            - \p opt::back_off - back-off strategy used for spinning, defult is \p cds::backoff::Default.

         */
         template <typename... Options>
         struct make_traits {
         */
         template <typename... Options>
         struct make_traits {

-            typedef typename cds::opt::make_options< type_traits, Options...>::type type  ;   ///< Result of metafunction
+            typedef typename cds::opt::make_options< traits, Options...>::type type  ;   ///< Result of metafunction

         };
 
         };
 

-

         /// Static bucket table
         /**
         /// Static bucket table
         /**

-            Non-resizeable bucket table for SplitListSet class.
+            Non-resizeable bucket table for \p SplitListSet class.

             The capacity of table (max bucket count) is defined in the constructor call.
 
             Template parameter:
             The capacity of table (max bucket count) is defined in the constructor call.
 
             Template parameter:

-            - \p GC - garbage collector used
-            - \p Node - node type, must be a type based on\ref node template
+            - \p GC - garbage collector
+            - \p Node - node type, must be a type based on \p split_list::node

             - \p Options... - options
 
             \p Options are:
             - \p opt::allocator - allocator used to allocate bucket table. Default is \ref CDS_DEFAULT_ALLOCATOR
             - \p Options... - options
 
             \p Options are:
             - \p opt::allocator - allocator used to allocate bucket table. Default is \ref CDS_DEFAULT_ALLOCATOR

-            - \p opt::memory_model - memory model used. Possible types are opt::v::sequential_consistent, opt::v::relaxed_ordering
+            - \p opt::memory_model - memory model used. Possible types are \p opt::v::sequential_consistent, \p opt::v::relaxed_ordering

         */
         template <typename GC, typename Node, typename... Options>
         class static_bucket_table
         */
         template <typename GC, typename Node, typename... Options>
         class static_bucket_table


@@ -165,24 +250,24 @@ namespace cds { namespace intrusive {
                 typedef CDS_DEFAULT_ALLOCATOR       allocator;
                 typedef opt::v::relaxed_ordering    memory_model;
             };
                 typedef CDS_DEFAULT_ALLOCATOR       allocator;
                 typedef opt::v::relaxed_ordering    memory_model;
             };

-            typedef typename opt::make_options< default_options, Options... >::type   options;
+            typedef typename opt::make_options< default_options, Options... >::type options;

             //@endcond
 
         public:
             //@endcond
 
         public:

-            typedef GC      gc          ;   ///< Garbage collector
-            typedef Node    node_type   ;   ///< Bucket node type
-            typedef atomics::atomic<node_type *> table_entry ;   ///< Table entry type
+            typedef GC      gc;         ///< Garbage collector
+            typedef Node    node_type;  ///< Bucket node type
+            typedef atomics::atomic<node_type *> table_entry;  ///< Table entry type

 
             /// Bucket table allocator
             typedef cds::details::Allocator< table_entry, typename options::allocator >  bucket_table_allocator;
 
             /// Memory model for atomic operations
 
             /// Bucket table allocator
             typedef cds::details::Allocator< table_entry, typename options::allocator >  bucket_table_allocator;
 
             /// Memory model for atomic operations

-            typedef typename options::memory_model     memory_model;
+            typedef typename options::memory_model  memory_model;

 
         protected:
 
         protected:

-            const size_t   m_nLoadFactor    ;    ///< load factor (average count of items per bucket)
-            const size_t   m_nCapacity      ;    ///< Bucket table capacity
-            table_entry *  m_Table          ;    ///< Bucket table
+            const size_t   m_nLoadFactor; ///< load factor (average count of items per bucket)
+            const size_t   m_nCapacity;   ///< Bucket table capacity
+            table_entry *  m_Table;       ///< Bucket table

 
         protected:
             //@cond
 
         protected:
             //@cond


@@ -206,7 +291,7 @@ namespace cds { namespace intrusive {
                 allocate_table();
             }
 
                 allocate_table();
             }
 

-            /// Constructs
+            /// Creates the table with specified size rounded up to nearest power-of-two

             static_bucket_table(
                 size_t nItemCount,        ///< Max expected item count in split-ordered list
                 size_t nLoadFactor        ///< Load factor
             static_bucket_table(
                 size_t nItemCount,        ///< Max expected item count in split-ordered list
                 size_t nLoadFactor        ///< Load factor


@@ -219,7 +304,7 @@ namespace cds { namespace intrusive {
                 allocate_table();
             }
 
                 allocate_table();
             }
 

-            /// Destroy bucket table
+            /// Destroys bucket table

             ~static_bucket_table()
             {
                 destroy_table();
             ~static_bucket_table()
             {
                 destroy_table();


@@ -232,7 +317,7 @@ namespace cds { namespace intrusive {
                 return m_Table[ nBucket ].load(memory_model::memory_order_acquire);
             }
 
                 return m_Table[ nBucket ].load(memory_model::memory_order_acquire);
             }
 

-            /// Set head node \p pNode of bucket \p nBucket
+            /// Set \p pNode as a head of bucket \p nBucket

             void bucket( size_t nBucket, node_type * pNode )
             {
                 assert( nBucket < capacity() );
             void bucket( size_t nBucket, node_type * pNode )
             {
                 assert( nBucket < capacity() );


@@ -260,13 +345,13 @@ namespace cds { namespace intrusive {
             up to maximum bucket count.
 
             Template parameter:
             up to maximum bucket count.
 
             Template parameter:

-            - \p GC - garbage collector used
-            - \p Node - node type, must be an instantiation of \ref node template
+            - \p GC - garbage collector
+            - \p Node - node type, must be derived from \p split_list::node

             - \p Options... - options
 
             \p Options are:
             - \p opt::allocator - allocator used to allocate bucket table. Default is \ref CDS_DEFAULT_ALLOCATOR
             - \p Options... - options
 
             \p Options are:
             - \p opt::allocator - allocator used to allocate bucket table. Default is \ref CDS_DEFAULT_ALLOCATOR

-            - \p opt::memory_model - memory model used. Possible types are opt::v::sequential_consistent, opt::v::relaxed_ordering
+            - \p opt::memory_model - memory model used. Possible types are \p opt::v::sequential_consistent, \p opt::v::relaxed_ordering

         */
         template <typename GC, typename Node, typename... Options>
         class expandable_bucket_table
         */
         template <typename GC, typename Node, typename... Options>
         class expandable_bucket_table


@@ -277,18 +362,18 @@ namespace cds { namespace intrusive {
                 typedef CDS_DEFAULT_ALLOCATOR       allocator;
                 typedef opt::v::relaxed_ordering    memory_model;
             };
                 typedef CDS_DEFAULT_ALLOCATOR       allocator;
                 typedef opt::v::relaxed_ordering    memory_model;
             };

-            typedef typename opt::make_options< default_options, Options... >::type   options;
+            typedef typename opt::make_options< default_options, Options... >::type options;

             //@endcond
         public:
             //@endcond
         public:

-            typedef GC      gc          ;   ///< Garbage collector
-            typedef Node    node_type   ;   ///< Bucket node type
-            typedef atomics::atomic<node_type *> table_entry ;   ///< Table entry type
+            typedef GC      gc;        ///< Garbage collector
+            typedef Node    node_type; ///< Bucket node type
+            typedef atomics::atomic<node_type *> table_entry; ///< Table entry type

 
             /// Memory model for atomic operations
 
             /// Memory model for atomic operations

-            typedef typename options::memory_model     memory_model;
+            typedef typename options::memory_model memory_model;

 
         protected:
 
         protected:

-            typedef atomics::atomic<table_entry *>   segment_type    ;   ///< Bucket table segment type
+            typedef atomics::atomic<table_entry *>   segment_type; ///< Bucket table segment type

 
         public:
             /// Bucket table allocator
 
         public:
             /// Bucket table allocator


@@ -300,12 +385,13 @@ namespace cds { namespace intrusive {
         protected:
             /// Bucket table metrics
             struct metrics {
         protected:
             /// Bucket table metrics
             struct metrics {

-                size_t    nSegmentCount     ;    ///< max count of segments in bucket table
-                size_t    nSegmentSize      ;    ///< the segment's capacity. The capacity must be power of two.
-                size_t    nSegmentSizeLog2  ;    ///< log2( m_nSegmentSize )
-                size_t    nLoadFactor       ;    ///< load factor
-                size_t    nCapacity         ;    ///< max capacity of bucket table
+                size_t    nSegmentCount;    ///< max count of segments in bucket table
+                size_t    nSegmentSize;     ///< the segment's capacity. The capacity must be power of two.
+                size_t    nSegmentSizeLog2; ///< <tt> log2( m_nSegmentSize )</tt>
+                size_t    nLoadFactor;      ///< load factor
+                size_t    nCapacity;        ///< max capacity of bucket table

 
 

+                //@cond

                 metrics()
                     : nSegmentCount(1024)
                     , nSegmentSize(512)
                 metrics()
                     : nSegmentCount(1024)
                     , nSegmentSize(512)


@@ -313,14 +399,12 @@ namespace cds { namespace intrusive {
                     , nLoadFactor(1)
                     , nCapacity( nSegmentCount * nSegmentSize )
                 {}
                     , nLoadFactor(1)
                     , nCapacity( nSegmentCount * nSegmentSize )
                 {}

+                //@endcond

             };
             };

-
-            const metrics   m_metrics   ;    ///< Dynamic bucket table metrics
+            const metrics   m_metrics; ///< Dynamic bucket table metrics

 
         protected:
 
         protected:

-            //const size_t   m_nLoadFactor;    ///< load factor (average count of items per bucket)
-            //const size_t   m_nCapacity  ;    ///< Bucket table capacity
-            segment_type * m_Segments   ;    ///< bucket table - array of segments
+            segment_type * m_Segments; ///< bucket table - array of segments

 
         protected:
             //@cond
 
         protected:
             //@cond


@@ -397,7 +481,7 @@ namespace cds { namespace intrusive {
                 init_segments();
             }
 
                 init_segments();
             }
 

-            /// Constructs
+            /// Creates the table with specified capacity rounded up to nearest power-of-two

             expandable_bucket_table(
                 size_t nItemCount,        ///< Max expected item count in split-ordered list
                 size_t nLoadFactor        ///< Load factor
             expandable_bucket_table(
                 size_t nItemCount,        ///< Max expected item count in split-ordered list
                 size_t nLoadFactor        ///< Load factor


@@ -407,7 +491,7 @@ namespace cds { namespace intrusive {
                 init_segments();
             }
 
                 init_segments();
             }
 

-            /// Destroy bucket table
+            /// Destroys bucket table

             ~expandable_bucket_table()
             {
                 segment_type * pSegments = m_Segments;
             ~expandable_bucket_table()
             {
                 segment_type * pSegments = m_Segments;


@@ -431,7 +515,7 @@ namespace cds { namespace intrusive {
                 return pSegment[ nBucket & (m_metrics.nSegmentSize - 1) ].load(memory_model::memory_order_acquire);
             }
 
                 return pSegment[ nBucket & (m_metrics.nSegmentSize - 1) ].load(memory_model::memory_order_acquire);
             }
 

-            /// Set head node \p pNode of bucket \p nBucket
+            /// Set \p pNode as a head of bucket \p nBucket

             void bucket( size_t nBucket, node_type * pNode )
             {
                 size_t nSegment = nBucket >> m_metrics.nSegmentSizeLog2;
             void bucket( size_t nBucket, node_type * pNode )
             {
                 size_t nSegment = nBucket >> m_metrics.nSegmentSizeLog2;


@@ -472,10 +556,10 @@ namespace cds { namespace intrusive {
         template <class BaseNodeTraits>
         struct node_traits: private BaseNodeTraits
         {
         template <class BaseNodeTraits>
         struct node_traits: private BaseNodeTraits
         {

-            typedef BaseNodeTraits base_class ;     ///< Base ordered list type
-            typedef typename base_class::value_type value_type      ;   ///< Value type
-            typedef typename base_class::node_type  base_node_type  ;   ///< Ordered list node type
-            typedef node<base_node_type>            node_type       ;   ///< Spit-list node type
+            typedef BaseNodeTraits base_class;     ///< Base ordered list node type
+            typedef typename base_class::value_type value_type;     ///< Value type
+            typedef typename base_class::node_type  base_node_type; ///< Ordered list node type
+            typedef node<base_node_type>            node_type;      ///< Spit-list node type

 
             /// Convert value reference to node pointer
             static node_type * to_node_ptr( value_type& v )
 
             /// Convert value reference to node pointer
             static node_type * to_node_ptr( value_type& v )


@@ -526,7 +610,6 @@ namespace cds { namespace intrusive {
             }
         };
 
             }
         };
 

-

         //@cond
         namespace details {
             template <bool Value, typename GC, typename Node, typename... Options>
         //@cond
         namespace details {
             template <bool Value, typename GC, typename Node, typename... Options>


@@ -564,12 +647,6 @@ namespace cds { namespace intrusive {
                     : val( v )
                     , nHash( h )
                 {}
                     : val( v )
                     , nHash( h )
                 {}

-                /*
-                operator Q&() const
-                {
-                    return val;
-                }
-                */

             };
 
             template <class OrderedList, class Options>
             };
 
             template <class OrderedList, class Options>


@@ -670,7 +747,7 @@ namespace cds { namespace intrusive {
                     }
                 };
 
                     }
                 };
 

-                typedef typename native_ordered_list::template rebind_options<
+                typedef typename native_ordered_list::template rebind_traits<

                     opt::compare< key_compare >
                     ,opt::disposer< wrapped_disposer >
                     ,opt::boundary_node_type< splitlist_node_type >
                     opt::compare< key_compare >
                     ,opt::disposer< wrapped_disposer >
                     ,opt::boundary_node_type< splitlist_node_type >


@@ -767,8 +844,6 @@ namespace cds { namespace intrusive {
                     return m_itCur != i.m_itCur;
                 }
             };
                     return m_itCur != i.m_itCur;
                 }
             };

-
-

         }   // namespace details
         //@endcond
 
         }   // namespace details
         //@endcond
 


@@ -796,7 +871,7 @@ namespace cds { namespace intrusive {
 
     //@cond
     // Forward declaration
 
     //@cond
     // Forward declaration

-    template <class GC, class OrderedList, class Traits = split_list::type_traits>
+    template <class GC, class OrderedList, class Traits = split_list::traits>

     class SplitListSet;
     //@endcond
 
     class SplitListSet;
     //@endcond
 

diff --git a/cds/intrusive/impl/lazy_list.h b/cds/intrusive/impl/lazy_list.h
index 72d7e2abe4ab575103570331b2f2775b0d37239a..c485b7ac50fbcb51b4afa7c1d855950a04d40f40 100644 (file)
--- a/cds/intrusive/impl/lazy_list.h
+++ b/cds/intrusive/impl/lazy_list.h
@@ -183,7 +183,7 @@ namespace cds { namespace intrusive {
         //@cond
         // Rebind traits (split-list support)
         template <typename... Options>
         //@cond
         // Rebind traits (split-list support)
         template <typename... Options>

-        struct rebind_options {
+        struct rebind_traits {

             typedef LazyList<
                 gc
                 , value_type
             typedef LazyList<
                 gc
                 , value_type

diff --git a/cds/intrusive/michael_set.h b/cds/intrusive/michael_set.h
index 178442771ba4c72d8dc98fd1f3d7d3d9482557d4..c6dafa8130c513b4a6428c009dc61a0bf260f2f2 100644 (file)
--- a/cds/intrusive/michael_set.h
+++ b/cds/intrusive/michael_set.h
@@ -403,7 +403,7 @@ namespace cds { namespace intrusive {
 
             The user-defined functor is called only if the inserting is success.
 
 
             The user-defined functor is called only if the inserting is success.
 

-            @warning For \ref cds_intrusive_MichaelList_hp "MichaelList": as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting".
+            @warning For \ref cds_intrusive_MichaelList_hp "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting".

             \ref cds_intrusive_LazyList_hp "LazyList" provides exclusive access to inserted item and does not require any node-level
             synchronization.
         */
             \ref cds_intrusive_LazyList_hp "LazyList" provides exclusive access to inserted item and does not require any node-level
             synchronization.
         */

diff --git a/cds/intrusive/split_list.h b/cds/intrusive/split_list.h
index ed9f5111c5b0064d865a51d07a1063cacca71574..5aa0efce73abc9133c0b2f47342f02f7e76dc62a 100644 (file)
--- a/cds/intrusive/split_list.h
+++ b/cds/intrusive/split_list.h
@@ -17,7 +17,7 @@ namespace cds { namespace intrusive {
 
         The split-ordered list is a lock-free implementation of an extensible unbounded hash table. It uses original
         recursive split-ordering algorithm discovered by Ori Shalev and Nir Shavit that allows to split buckets
 
         The split-ordered list is a lock-free implementation of an extensible unbounded hash table. It uses original
         recursive split-ordering algorithm discovered by Ori Shalev and Nir Shavit that allows to split buckets

-        without items moving on resizing.
+        without item moving on resizing.

 
         \anchor cds_SplitList_algo_desc
         <b>Short description</b>
 
         \anchor cds_SplitList_algo_desc
         <b>Short description</b>


@@ -60,13 +60,13 @@ namespace cds { namespace intrusive {
         <b>Implementation</b>
 
         Template parameters are:
         <b>Implementation</b>
 
         Template parameters are:

-        - \p GC - Garbage collector used. Note the \p GC must be the same as the GC used for \p OrderedList
-        - \p OrderedList - ordered list implementation used as bucket for hash set, for example, MichaelList, LazyList.
+        - \p GC - Garbage collector. Note the \p GC must be the same as the \p GC used for \p OrderedList
+        - \p OrderedList - ordered list implementation used as a bucket for hash set, for example, \p MichaelList, \p LazyList.

             The intrusive ordered list implementation specifies the type \p T stored in the hash-set, the reclamation
             schema \p GC used by hash-set, the comparison functor for the type \p T and other features specific for
             the ordered list.
             The intrusive ordered list implementation specifies the type \p T stored in the hash-set, the reclamation
             schema \p GC used by hash-set, the comparison functor for the type \p T and other features specific for
             the ordered list.

-        - \p Traits - type traits. See split_list::type_traits for explanation.
-            Instead of defining \p Traits struct you may use option-based syntax with split_list::make_traits metafunction.
+        - \p Traits - split-list traits, default is \p split_list::traits.
+            Instead of defining \p Traits struct you may use option-based syntax with \p split_list::make_traits metafunction.

 
         There are several specialization of the split-list class for different \p GC:
         - for \ref cds_urcu_gc "RCU type" include <tt><cds/intrusive/split_list_rcu.h></tt> - see
 
         There are several specialization of the split-list class for different \p GC:
         - for \ref cds_urcu_gc "RCU type" include <tt><cds/intrusive/split_list_rcu.h></tt> - see


@@ -80,7 +80,7 @@ namespace cds { namespace intrusive {
         Some member functions of split-ordered list accept the key parameter of type \p Q which differs from \p value_type.
         It is expected that type \p Q contains full key of \p value_type, and for equal keys of type \p Q and \p value_type
         the hash values of these keys must be equal too.
         Some member functions of split-ordered list accept the key parameter of type \p Q which differs from \p value_type.
         It is expected that type \p Q contains full key of \p value_type, and for equal keys of type \p Q and \p value_type
         the hash values of these keys must be equal too.

-        The hash functor <tt>Traits::hash</tt> should accept parameters of both type:
+        The hash functor \p Traits::hash should accept parameters of both type:

         \code
         // Our node type
         struct Foo {
         \code
         // Our node type
         struct Foo {


@@ -133,7 +133,6 @@ namespace cds { namespace intrusive {
         };
 
         // Declare base ordered-list type for split-list
         };
 
         // Declare base ordered-list type for split-list

-        // It may be any ordered list type like MichaelList, LazyList

         typedef cds::intrusive::MichaelList< cds::gc::HP, Foo,
             typename cds::intrusive::michael_list::make_traits<
                 // hook option
         typedef cds::intrusive::MichaelList< cds::gc::HP, Foo,
             typename cds::intrusive::michael_list::make_traits<
                 // hook option


@@ -180,13 +179,12 @@ namespace cds { namespace intrusive {
 
             // and so on ...
         \endcode
 
             // and so on ...
         \endcode

-

     */
     template <
         class GC,
         class OrderedList,
 #   ifdef CDS_DOXYGEN_INVOKED
     */
     template <
         class GC,
         class OrderedList,
 #   ifdef CDS_DOXYGEN_INVOKED

-        class Traits = split_list::type_traits
+        class Traits = split_list::traits

 #   else
         class Traits
 #   endif
 #   else
         class Traits
 #   endif


@@ -194,54 +192,54 @@ namespace cds { namespace intrusive {
     class SplitListSet
     {
     public:
     class SplitListSet
     {
     public:

-        typedef Traits          options ;   ///< Traits template parameters
-        typedef GC              gc      ;   ///< Garbage collector
+        typedef GC     gc;     ///< Garbage collector
+        typedef Traits traits; ///< Set traits

 
     protected:
         //@cond
 
     protected:
         //@cond

-        typedef split_list::details::rebind_list_options<OrderedList, options> wrapped_ordered_list;
+        typedef split_list::details::rebind_list_options<OrderedList, traits> wrapped_ordered_list;

         //@endcond
 
     public:
 #   ifdef CDS_DOXYGEN_INVOKED
         //@endcond
 
     public:
 #   ifdef CDS_DOXYGEN_INVOKED

-        typedef OrderedList         ordered_list    ;   ///< type of ordered list used as base for split-list
+        typedef OrderedList         ordered_list;   ///< type of ordered list used as a base for split-list

 #   else
         typedef typename wrapped_ordered_list::result   ordered_list;
 #   endif
 #   else
         typedef typename wrapped_ordered_list::result   ordered_list;
 #   endif

-        typedef typename ordered_list::value_type       value_type      ;   ///< type of value stored in the split-list
-        typedef typename ordered_list::key_comparator   key_comparator  ;   ///< key comparison functor
-        typedef typename ordered_list::disposer         disposer        ;   ///< Node disposer functor
+        typedef typename ordered_list::value_type       value_type;     ///< type of value stored in the split-list
+        typedef typename ordered_list::key_comparator   key_comparator; ///< key comparison functor
+        typedef typename ordered_list::disposer         disposer;       ///< Node disposer functor

 
         /// Hash functor for \p %value_type and all its derivatives that you use
 
         /// Hash functor for \p %value_type and all its derivatives that you use

-        typedef typename cds::opt::v::hash_selector< typename options::hash >::type   hash;
+        typedef typename cds::opt::v::hash_selector< typename traits::hash >::type hash;

 
 

-        typedef typename options::item_counter          item_counter    ;   ///< Item counter type
-        typedef typename options::back_off              back_off        ;   ///< back-off strategy for spinning
-        typedef typename options::memory_model          memory_model    ;   ///< Memory ordering. See cds::opt::memory_model option
-        typedef typename ordered_list::guarded_ptr      guarded_ptr; ///< Guarded pointer
+        typedef typename traits::item_counter      item_counter; ///< Item counter type
+        typedef typename traits::back_off          back_off;     ///< back-off strategy for spinning
+        typedef typename traits::memory_model      memory_model; ///< Memory ordering. See cds::opt::memory_model option
+        typedef typename traits::stat              stat;         ///< Internal statistics, see \p spit_list::stat
+        typedef typename ordered_list::guarded_ptr guarded_ptr;  ///< Guarded pointer

 
     protected:
 
     protected:

-        typedef typename ordered_list::node_type    list_node_type      ;   ///< Node type as declared in ordered list
-        typedef split_list::node<list_node_type>    node_type           ;   ///< split-list node type
-        typedef node_type                           dummy_node_type     ;   ///< dummy node type
+        typedef typename ordered_list::node_type    list_node_type;  ///< Node type as declared in ordered list
+        typedef split_list::node<list_node_type>    node_type;       ///< split-list node type
+        typedef node_type                           dummy_node_type; ///< dummy node type

 
         /// Split-list node traits
         /**
 
         /// Split-list node traits
         /**

-            This traits is intended for converting between underlying ordered list node type \ref list_node_type
-            and split-list node type \ref node_type
+            This traits is intended for converting between underlying ordered list node type \p list_node_type
+            and split-list node type \p node_type

         */
         typedef split_list::node_traits<typename ordered_list::node_traits>  node_traits;
 
         //@cond
         /// Bucket table implementation
         typedef typename split_list::details::bucket_table_selector<
         */
         typedef split_list::node_traits<typename ordered_list::node_traits>  node_traits;
 
         //@cond
         /// Bucket table implementation
         typedef typename split_list::details::bucket_table_selector<

-            options::dynamic_bucket_table
+            traits::dynamic_bucket_table

             , gc
             , dummy_node_type
             , gc
             , dummy_node_type

-            , opt::allocator< typename options::allocator >
+            , opt::allocator< typename traits::allocator >

             , opt::memory_model< memory_model >
         >::type bucket_table;
             , opt::memory_model< memory_model >
         >::type bucket_table;

-

         //@endcond
 
     protected:
         //@endcond
 
     protected:


@@ -344,22 +342,26 @@ namespace cds { namespace intrusive {
         //@endcond
 
     protected:
         //@endcond
 
     protected:

-        ordered_list_wrapper    m_List              ;   ///< Ordered list containing split-list items
-        bucket_table            m_Buckets           ;   ///< bucket table
-        atomics::atomic<size_t> m_nBucketCountLog2  ;   ///< log2( current bucket count )
-        item_counter            m_ItemCounter       ;   ///< Item counter
-        hash                    m_HashFunctor       ;   ///< Hash functor
+        ordered_list_wrapper    m_List;             ///< Ordered list containing split-list items
+        bucket_table            m_Buckets;          ///< bucket table
+        atomics::atomic<size_t> m_nBucketCountLog2; ///< log2( current bucket count )
+        item_counter            m_ItemCounter;      ///< Item counter
+        hash                    m_HashFunctor;      ///< Hash functor
+        stat                    m_Stat;             ///< Internal statistics

 
     protected:
         //@cond
 
     protected:
         //@cond

-        typedef cds::details::Allocator< dummy_node_type, typename options::allocator >   dummy_node_allocator;
-        static dummy_node_type * alloc_dummy_node( size_t nHash )
+        typedef cds::details::Allocator< dummy_node_type, typename traits::allocator >   dummy_node_allocator;
+
+        dummy_node_type * alloc_dummy_node( size_t nHash )

         {
         {

+            m_Stat.onHeadNodeAllocated();

             return dummy_node_allocator().New( nHash );
         }
             return dummy_node_allocator().New( nHash );
         }

-        static void free_dummy_node( dummy_node_type * p )
+        void free_dummy_node( dummy_node_type * p )

         {
             dummy_node_allocator().Delete( p );
         {
             dummy_node_allocator().Delete( p );

+            m_Stat.onHeadNodeFreed();

         }
 
         /// Calculates hash value of \p key
         }
 
         /// Calculates hash value of \p key


@@ -388,6 +390,7 @@ namespace cds { namespace intrusive {
             dummy_node_type * pParentBucket = m_Buckets.bucket( nParent );
             if ( pParentBucket == nullptr ) {
                 pParentBucket = init_bucket( nParent );
             dummy_node_type * pParentBucket = m_Buckets.bucket( nParent );
             if ( pParentBucket == nullptr ) {
                 pParentBucket = init_bucket( nParent );

+                m_Stat.onRecursiveInitBucket();

             }
 
             assert( pParentBucket != nullptr );
             }
 
             assert( pParentBucket != nullptr );


@@ -397,6 +400,7 @@ namespace cds { namespace intrusive {
                 dummy_node_type * pBucket = alloc_dummy_node( split_list::dummy_hash( nBucket ) );
                 if ( m_List.insert_aux_node( pParentBucket, pBucket ) ) {
                     m_Buckets.bucket( nBucket, pBucket );
                 dummy_node_type * pBucket = alloc_dummy_node( split_list::dummy_hash( nBucket ) );
                 if ( m_List.insert_aux_node( pParentBucket, pBucket ) ) {
                     m_Buckets.bucket( nBucket, pBucket );

+                    m_Stat.onNewBucket();

                     return pBucket;
                 }
                 free_dummy_node( pBucket );
                     return pBucket;
                 }
                 free_dummy_node( pBucket );


@@ -408,12 +412,14 @@ namespace cds { namespace intrusive {
             // The compiler can decide that waiting loop can be "optimized" (stripped)
             // To prevent this situation, we use waiting on volatile bucket_head_ptr pointer.
             //
             // The compiler can decide that waiting loop can be "optimized" (stripped)
             // To prevent this situation, we use waiting on volatile bucket_head_ptr pointer.
             //

+            m_Stat.onBucketInitContenton();

             back_off bkoff;
             while ( true ) {
                 dummy_node_type volatile * p = m_Buckets.bucket( nBucket );
                 if ( p != nullptr )
                     return const_cast<dummy_node_type *>( p );
                 bkoff();
             back_off bkoff;
             while ( true ) {
                 dummy_node_type volatile * p = m_Buckets.bucket( nBucket );
                 if ( p != nullptr )
                     return const_cast<dummy_node_type *>( p );
                 bkoff();

+                m_Stat.onBusyWaitBucketInit();

             }
         }
 
             }
         }
 


@@ -464,8 +470,10 @@ namespace cds { namespace intrusive {
             dummy_node_type * pHead = get_bucket( nHash );
             assert( pHead != nullptr );
 
             dummy_node_type * pHead = get_bucket( nHash );
             assert( pHead != nullptr );
 

-            return m_List.find_at( pHead, sv, cmp,
-                [&f](value_type& item, split_list::details::search_value_type<Q>& val){ f(item, val.val ); });
+            return m_Stat.onFind( 
+                m_List.find_at( pHead, sv, cmp,
+                    [&f](value_type& item, split_list::details::search_value_type<Q>& val){ f(item, val.val ); })
+            );

         }
 
         template <typename Q, typename Compare>
         }
 
         template <typename Q, typename Compare>


@@ -476,7 +484,7 @@ namespace cds { namespace intrusive {
             dummy_node_type * pHead = get_bucket( nHash );
             assert( pHead != nullptr );
 
             dummy_node_type * pHead = get_bucket( nHash );
             assert( pHead != nullptr );
 

-            return m_List.find_at( pHead, sv, cmp );
+            return m_Stat.onFind( m_List.find_at( pHead, sv, cmp ));

         }
 
         template <typename Q, typename Compare>
         }
 
         template <typename Q, typename Compare>


@@ -487,7 +495,7 @@ namespace cds { namespace intrusive {
             dummy_node_type * pHead = get_bucket( nHash );
             assert( pHead != nullptr );
 
             dummy_node_type * pHead = get_bucket( nHash );
             assert( pHead != nullptr );
 

-            return m_List.get_at( pHead, guard, sv, cmp );
+            return m_Stat.onFind( m_List.get_at( pHead, guard, sv, cmp ));

         }
 
         template <typename Q>
         }
 
         template <typename Q>


@@ -512,8 +520,10 @@ namespace cds { namespace intrusive {
 
             if ( m_List.erase_at( pHead, sv, cmp, f )) {
                 --m_ItemCounter;
 
             if ( m_List.erase_at( pHead, sv, cmp, f )) {
                 --m_ItemCounter;

+                m_Stat.onEraseSuccess();

                 return true;
             }
                 return true;
             }

+            m_Stat.onEraseFailed();

             return false;
         }
 
             return false;
         }
 


@@ -527,8 +537,10 @@ namespace cds { namespace intrusive {
 
             if ( m_List.erase_at( pHead, sv, cmp ) ) {
                 --m_ItemCounter;
 
             if ( m_List.erase_at( pHead, sv, cmp ) ) {
                 --m_ItemCounter;

+                m_Stat.onEraseSuccess();

                 return true;
             }
                 return true;
             }

+            m_Stat.onEraseFailed();

             return false;
         }
 
             return false;
         }
 


@@ -542,8 +554,10 @@ namespace cds { namespace intrusive {
 
             if ( m_List.extract_at( pHead, guard, sv, cmp ) ) {
                 --m_ItemCounter;
 
             if ( m_List.extract_at( pHead, guard, sv, cmp ) ) {
                 --m_ItemCounter;

+                m_Stat.onExtractSuccess();

                 return true;
             }
                 return true;
             }

+            m_Stat.onExtractFailed();

             return false;
         }
 
             return false;
         }
 


@@ -565,8 +579,8 @@ namespace cds { namespace intrusive {
         /// Initialize split-ordered list of default capacity
         /**
             The default capacity is defined in bucket table constructor.
         /// Initialize split-ordered list of default capacity
         /**
             The default capacity is defined in bucket table constructor.

-            See split_list::expandable_bucket_table, split_list::static_ducket_table
-            which selects by split_list::dynamic_bucket_table option.
+            See \p split_list::expandable_bucket_table, \p split_list::static_ducket_table
+            which selects by \p split_list::dynamic_bucket_table option.

         */
         SplitListSet()
             : m_nBucketCountLog2(1)
         */
         SplitListSet()
             : m_nBucketCountLog2(1)


@@ -603,8 +617,10 @@ namespace cds { namespace intrusive {
 
             if ( m_List.insert_at( pHead, val )) {
                 inc_item_count();
 
             if ( m_List.insert_at( pHead, val )) {
                 inc_item_count();

+                m_Stat.onInsertSuccess();

                 return true;
             }
                 return true;
             }

+            m_Stat.onInsertFailed();

             return false;
         }
 
             return false;
         }
 


@@ -621,10 +637,12 @@ namespace cds { namespace intrusive {
             \code
                 void func( value_type& val );
             \endcode
             \code
                 void func( value_type& val );
             \endcode

-            where \p val is the item inserted. User-defined functor \p f should guarantee that during changing
-            \p val no any other changes could be made on this set's item by concurrent threads.
-            The user-defined functor is called only if the inserting is success and may be passed by reference
-            using \p std::ref.
+            where \p val is the item inserted.
+            The user-defined functor is called only if the inserting is success.
+
+            @warning For \ref cds_intrusive_MichaelList_hp "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting".
+            \ref cds_intrusive_LazyList_hp "LazyList" provides exclusive access to inserted item and does not require any node-level
+            synchronization.

         */
         template <typename Func>
         bool insert( value_type& val, Func f )
         */
         template <typename Func>
         bool insert( value_type& val, Func f )


@@ -637,8 +655,10 @@ namespace cds { namespace intrusive {
 
             if ( m_List.insert_at( pHead, val, f )) {
                 inc_item_count();
 
             if ( m_List.insert_at( pHead, val, f )) {
                 inc_item_count();

+                m_Stat.onInsertSuccess();

                 return true;
             }
                 return true;
             }

+            m_Stat.onInsertFailed();

             return false;
         }
 
             return false;
         }
 


@@ -659,14 +679,15 @@ namespace cds { namespace intrusive {
             If new item has been inserted (i.e. \p bNew is \p true) then \p item and \p val arguments
             refers to the same thing.
 
             If new item has been inserted (i.e. \p bNew is \p true) then \p item and \p val arguments
             refers to the same thing.
 

-            The functor can 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 can pass \p func argument by value or by reference using \p std::ref.
+            The functor can change non-key fields of the \p item.

 
             Returns std::pair<bool, bool> where \p first is \p true if operation is successfull,
             \p second is \p true if new item has been added or \p false if the item with \p key
             already is in the set.
 
             Returns std::pair<bool, bool> where \p first is \p true if operation is successfull,
             \p second is \p true if new item has been added or \p false if the item with \p key
             already is in the set.

+
+            @warning For \ref cds_intrusive_MichaelList_hp "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting".
+            \ref cds_intrusive_LazyList_hp "LazyList" provides exclusive access to inserted item and does not require any node-level
+            synchronization.

         */
         template <typename Func>
         std::pair<bool, bool> ensure( value_type& val, Func func )
         */
         template <typename Func>
         std::pair<bool, bool> ensure( value_type& val, Func func )


@@ -678,8 +699,12 @@ namespace cds { namespace intrusive {
             node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash );
 
             std::pair<bool, bool> bRet = m_List.ensure_at( pHead, val, func );
             node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash );
 
             std::pair<bool, bool> bRet = m_List.ensure_at( pHead, val, func );

-            if ( bRet.first && bRet.second )
+            if ( bRet.first && bRet.second ) {

                 inc_item_count();
                 inc_item_count();

+                m_Stat.onEnsureNew();
+            }
+            else
+                m_Stat.onEnsureExist();

             return bRet;
         }
 
             return bRet;
         }
 


@@ -703,46 +728,49 @@ namespace cds { namespace intrusive {
 
             if ( m_List.unlink_at( pHead, val ) ) {
                 --m_ItemCounter;
 
             if ( m_List.unlink_at( pHead, val ) ) {
                 --m_ItemCounter;

+                m_Stat.onEraseSuccess();

                 return true;
             }
                 return true;
             }

+            m_Stat.onEraseFailed();

             return false;
         }
 
         /// Deletes the item from the set
         /** \anchor cds_intrusive_SplitListSet_hp_erase
             return false;
         }
 
         /// Deletes the item from the set
         /** \anchor cds_intrusive_SplitListSet_hp_erase

-            The function searches an item with key equal to \p val in the set,
+            The function searches an item with key equal to \p key in the set,

             unlinks it from the set, and returns \p true.
             unlinks it from the set, and returns \p true.

-            If the item with key equal to \p val is not found the function return \p false.
+            If the item with key equal to \p key is not found the function return \p false.

 
             Difference between \ref erase and \p unlink functions: \p erase finds <i>a key</i>
             and deletes the item found. \p unlink finds an item by key and deletes it
 
             Difference between \ref erase and \p unlink functions: \p erase finds <i>a key</i>
             and deletes the item found. \p unlink finds an item by key and deletes it

-            only if \p val is an item of that set, i.e. the pointer to item found
-            is equal to <tt> &val </tt>.
+            only if \p key is an item of that set, i.e. the pointer to item found
+            is equal to <tt> &key </tt>.

 
             Note the hash functor should accept a parameter of type \p Q that can be not the same as \p value_type.
         */
         template <typename Q>
 
             Note the hash functor should accept a parameter of type \p Q that can be not the same as \p value_type.
         */
         template <typename Q>

-        bool erase( Q const& val )
+        bool erase( Q const& key )

         {
         {

-            return erase_( val, key_comparator() );
+            return erase_( key, key_comparator() );

         }
 
         /// Deletes the item from the set with comparing functor \p pred
         /**
         }
 
         /// Deletes the item from the set with comparing functor \p pred
         /**

+

             The function is an analog of \ref cds_intrusive_SplitListSet_hp_erase "erase(Q const&)"
             but \p pred predicate is used for key comparing.
             \p Less has the interface like \p std::less.
             \p pred must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less>
             The function is an analog of \ref cds_intrusive_SplitListSet_hp_erase "erase(Q const&)"
             but \p pred predicate is used for key comparing.
             \p Less has the interface like \p std::less.
             \p pred must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less>

-        bool erase_with( const Q& val, Less pred )
+        bool erase_with( const Q& key, Less pred )

         {
         {

-            return erase_( val, typename wrapped_ordered_list::template make_compare_from_less<Less>() );
+            return erase_( key, typename wrapped_ordered_list::template make_compare_from_less<Less>() );

         }
 
         /// Deletes the item from the set
         /** \anchor cds_intrusive_SplitListSet_hp_erase_func
         }
 
         /// Deletes the item from the set
         /** \anchor cds_intrusive_SplitListSet_hp_erase_func

-            The function searches an item with key equal to \p val in the set,
+            The function searches an item with key equal to \p key in the set,

             call \p f functor with item found, unlinks it from the set, and returns \p true.
             The \ref disposer specified by \p OrderedList class template parameter is called
             by garbage collector \p GC asynchronously.
             call \p f functor with item found, unlinks it from the set, and returns \p true.
             The \ref disposer specified by \p OrderedList class template parameter is called
             by garbage collector \p GC asynchronously.


@@ -755,14 +783,14 @@ namespace cds { namespace intrusive {
             \endcode
             The functor can be passed by reference with <tt>boost:ref</tt>
 
             \endcode
             The functor can be passed by reference with <tt>boost:ref</tt>
 

-            If the item with key equal to \p val is not found the function return \p false.
+            If the item with key equal to \p key is not found the function return \p false.

 
             Note the hash functor should accept a parameter of type \p Q that can be not the same as \p value_type.
         */
         template <typename Q, typename Func>
 
             Note the hash functor should accept a parameter of type \p Q that can be not the same as \p value_type.
         */
         template <typename Q, typename Func>

-        bool erase( Q const& val, Func f )
+        bool erase( Q const& key, Func f )

         {
         {

-            return erase_( val, key_comparator(), f );
+            return erase_( key, key_comparator(), f );

         }
 
         /// Deletes the item from the set with comparing functor \p pred
         }
 
         /// Deletes the item from the set with comparing functor \p pred


@@ -773,9 +801,9 @@ namespace cds { namespace intrusive {
             \p pred must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less, typename Func>
             \p pred must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less, typename Func>

-        bool erase_with( Q const& val, Less pred, Func f )
+        bool erase_with( Q const& key, Less pred, Func f )

         {
         {

-            return erase_( val, typename wrapped_ordered_list::template make_compare_from_less<Less>(), f );
+            return erase_( key, typename wrapped_ordered_list::template make_compare_from_less<Less>(), f );

         }
 
         /// Extracts the item with specified \p key
         }
 
         /// Extracts the item with specified \p key


@@ -826,17 +854,16 @@ namespace cds { namespace intrusive {
             return extract_with_( dest.guard(), key, pred );
         }
 
             return extract_with_( dest.guard(), key, pred );
         }
 

-
-        /// Finds the key \p val
+        /// Finds the key \p key

         /** \anchor cds_intrusive_SplitListSet_hp_find_func
         /** \anchor cds_intrusive_SplitListSet_hp_find_func

-            The function searches the item with key equal to \p val and calls the functor \p f for item found.
+            The function searches the item with key equal to \p key and calls the functor \p f for item found.

             The interface of \p Func functor is:
             \code
             struct functor {
             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
             };
             \endcode

-            where \p item is the item found, \p val is the <tt>find</tt> function argument.
+            where \p item is the item found, \p key is the <tt>find</tt> function argument.

 
             You can pass \p f argument by value or by reference using \p std::ref.
 
 
             You can pass \p f argument by value or by reference using \p std::ref.
 


@@ -845,21 +872,18 @@ namespace cds { namespace intrusive {
             The functor does not serialize simultaneous access to the set \p item. If such access is
             possible you must provide your own synchronization schema on item level to exclude unsafe item modifications.
 
             The functor does not serialize simultaneous access to the set \p item. If such access is
             possible you must provide your own synchronization schema on item level 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
-            can modify both arguments.
-

             Note the hash functor specified for class \p Traits template parameter
             should accept a parameter of type \p Q that can be not the same as \p value_type.
 
             Note the hash functor specified for class \p Traits template parameter
             should accept a parameter of type \p Q that can be not the same as \p value_type.
 

-            The function returns \p true if \p val is found, \p false otherwise.
+            The function returns \p true if \p key is found, \p false otherwise.

         */
         template <typename Q, typename Func>
         */
         template <typename Q, typename Func>

-        bool find( Q& val, Func f )
+        bool find( Q& key, Func f )

         {
         {

-            return find_( val, key_comparator(), f );
+            return find_( key, key_comparator(), f );

         }
 
         }
 

-        /// Finds the key \p val with \p pred predicate for comparing
+        /// Finds the key \p key with \p pred predicate for comparing

         /**
             The function is an analog of \ref cds_intrusive_SplitListSet_hp_find_func "find(Q&, Func)"
             but \p cmp is used for key compare.
         /**
             The function is an analog of \ref cds_intrusive_SplitListSet_hp_find_func "find(Q&, Func)"
             but \p cmp is used for key compare.


@@ -867,56 +891,14 @@ namespace cds { namespace intrusive {
             \p cmp must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less, typename Func>
             \p cmp must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less, typename Func>

-        bool find_with( Q& val, Less pred, Func f )
-        {
-            return find_( val, typename wrapped_ordered_list::template make_compare_from_less<Less>(), f );
-        }
-
-        /// Finds the key \p val
-        /** \anchor cds_intrusive_SplitListSet_hp_find_cfunc
-            The function searches the item with key equal to \p val and calls the functor \p f for 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 <tt>find</tt> function argument.
-
-            You can pass \p f argument by value or by reference using \p std::ref.
-
-            The functor can change non-key fields of \p item. Note that the functor is only guarantee
-            that \p item cannot be disposed during functor is executing.
-            The functor does not serialize simultaneous access to the set \p item. If such access is
-            possible you must provide your own synchronization schema on item level to exclude unsafe item modifications.
-
-            Note the hash functor specified for class \p Traits template parameter
-            should accept a parameter of type \p Q that can be not the same as \p value_type.
-
-            The function returns \p true if \p val is found, \p false otherwise.
-        */
-        template <typename Q, typename Func>
-        bool find( Q const& val, Func f )
-        {
-            return find_( val, key_comparator(), f );
-        }
-
-        /// Finds the key \p val with \p pred predicate for comparing
-        /**
-            The function is an analog of \ref cds_intrusive_SplitListSet_hp_find_cfunc "find(Q const&, Func)"
-            but \p cmp is used for key compare.
-            \p Less has the interface like \p std::less.
-            \p cmp must imply the same element order as the comparator used for building the set.
-        */
-        template <typename Q, typename Less, typename Func>
-        bool find_with( Q const& val, Less pred, Func f )
+        bool find_with( Q& key, Less pred, Func f )

         {
         {

-            return find_( val, typename wrapped_ordered_list::template make_compare_from_less<Less>(), f );
+            return find_( key, typename wrapped_ordered_list::template make_compare_from_less<Less>(), f );

         }
 
         }
 

-        /// Finds the key \p val
+        /// Finds the key \p key

         /** \anchor cds_intrusive_SplitListSet_hp_find_val
         /** \anchor cds_intrusive_SplitListSet_hp_find_val

-            The function searches the item with key equal to \p val
+            The function searches the item with key equal to \p key

             and returns \p true if it is found, and \p false otherwise.
 
             Note the hash functor specified for class \p Traits template parameter
             and returns \p true if it is found, and \p false otherwise.
 
             Note the hash functor specified for class \p Traits template parameter


@@ -924,12 +906,12 @@ namespace cds { namespace intrusive {
             Otherwise, you may use \p find_with functions with explicit predicate for key comparing.
         */
         template <typename Q>
             Otherwise, you may use \p find_with functions with explicit predicate for key comparing.
         */
         template <typename Q>

-        bool find( Q const& val )
+        bool find( Q const& key )

         {
         {

-            return find_( val, key_comparator() );
+            return find_( key, key_comparator() );

         }
 
         }
 

-        /// Finds the key \p val with \p pred predicate for comparing
+        /// Finds the key \p key with \p pred predicate for comparing

         /**
             The function is an analog of \ref cds_intrusive_SplitListSet_hp_find_val "find(Q const&)"
             but \p cmp is used for key compare.
         /**
             The function is an analog of \ref cds_intrusive_SplitListSet_hp_find_val "find(Q const&)"
             but \p cmp is used for key compare.


@@ -937,17 +919,17 @@ namespace cds { namespace intrusive {
             \p cmp must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less>
             \p cmp must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less>

-        bool find_with( Q const& val, Less pred )
+        bool find_with( Q const& key, Less pred )

         {
         {

-            return find_( val, typename wrapped_ordered_list::template make_compare_from_less<Less>() );
+            return find_( key, typename wrapped_ordered_list::template make_compare_from_less<Less>() );

         }
 
         }
 

-        /// Finds the key \p val and return the item found
+        /// Finds the key \p key and return the item found

         /** \anchor cds_intrusive_SplitListSet_hp_get
         /** \anchor cds_intrusive_SplitListSet_hp_get

-            The function searches the item with key equal to \p val
+            The function searches the item with key equal to \p key

             and assigns the item found to guarded pointer \p ptr.
             and assigns the item found to guarded pointer \p ptr.

-            The function returns \p true if \p val is found, and \p false otherwise.
-            If \p val is not found the \p ptr parameter is not changed.
+            The function returns \p true if \p key is found, and \p false otherwise.
+            If \p key is not found the \p ptr parameter is not changed.

 
             The \ref disposer specified in \p OrderedList class' template parameter is called
             by garbage collector \p GC automatically when returned \ref guarded_ptr object
 
             The \ref disposer specified in \p OrderedList class' template parameter is called
             by garbage collector \p GC automatically when returned \ref guarded_ptr object


@@ -973,12 +955,12 @@ namespace cds { namespace intrusive {
             should accept a parameter of type \p Q that can be not the same as \p value_type.
         */
         template <typename Q>
             should accept a parameter of type \p Q that can be not the same as \p value_type.
         */
         template <typename Q>

-        bool get( guarded_ptr& ptr, Q const& val )
+        bool get( guarded_ptr& ptr, Q const& key )

         {
         {

-            return get_( ptr.guard(), val );
+            return get_( ptr.guard(), key );

         }
 
         }
 

-        /// Finds the key \p val and return the item found
+        /// Finds the key \p key and return the item found

         /**
             The function is an analog of \ref cds_intrusive_SplitListSet_hp_get "get( guarded_ptr& ptr, Q const&)"
             but \p pred is used for comparing the keys.
         /**
             The function is an analog of \ref cds_intrusive_SplitListSet_hp_get "get( guarded_ptr& ptr, Q const&)"
             but \p pred is used for comparing the keys.


@@ -988,9 +970,9 @@ namespace cds { namespace intrusive {
             \p pred must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less>
             \p pred must imply the same element order as the comparator used for building the set.
         */
         template <typename Q, typename Less>

-        bool get_with( guarded_ptr& ptr, Q const& val, Less pred )
+        bool get_with( guarded_ptr& ptr, Q const& key, Less pred )

         {
         {

-            return get_with_( ptr.guard(), val, pred );
+            return get_with_( ptr.guard(), key, pred );

         }
 
         /// Returns item count in the set
         }
 
         /// Returns item count in the set

diff --git a/projects/Win/vc12/hdr-test-set.vcxproj b/projects/Win/vc12/hdr-test-set.vcxproj
index 012a7c76de6da1d43eb1ec379386732f6736b0dd..bcf2e1f30b3595a3b25fddb3c6f20e37a1db8524 100644 (file)
--- a/projects/Win/vc12/hdr-test-set.vcxproj
+++ b/projects/Win/vc12/hdr-test-set.vcxproj
@@ -575,12 +575,12 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_shb_member.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_sht_member.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_shb_member.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_sht_member.cpp" />\r

+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_dhp.cpp" />\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_dhp_lazy.cpp" />\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_hp_lazy.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_nogc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_nogc_lazy.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_hp_lazy.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_nogc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_nogc_lazy.cpp" />\r

-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_ptb.cpp" />\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_ptb_lazy.cpp" />\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpb_lazy.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpb_lazy.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpi.cpp" />\r


@@ -615,17 +615,17 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_skiplist_set_rcu_gpt.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_skiplist_set_rcu_shb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_skiplist_set_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_skiplist_set_rcu_gpt.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_skiplist_set_rcu_shb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_skiplist_set_rcu_sht.cpp" />\r

+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_dhp.cpp" />\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_hp.cpp" />\r

+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_dhp.cpp" />\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_nogc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_hp.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_nogc.cpp" />\r

-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_ptb.cpp" />\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpt.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_shb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_nogc.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpt.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_shb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_nogc.cpp" />\r

-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_ptb.cpp" />\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpt.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpb.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpi.cpp" />\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpt.cpp" />\r

diff --git a/projects/Win/vc12/hdr-test-set.vcxproj.filters b/projects/Win/vc12/hdr-test-set.vcxproj.filters
index ca24563ba8d0e5be7a510448ed317fc31dee3c3a..36b3542f59480f903573219ea377997da4bbc6a3 100644 (file)
--- a/projects/Win/vc12/hdr-test-set.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-set.vcxproj.filters
@@ -101,12 +101,6 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_nogc_lazy.cpp">\r
       <Filter>intrusive\split_list</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_nogc_lazy.cpp">\r
       <Filter>intrusive\split_list</Filter>\r
     </ClCompile>\r

-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_ptb.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_ptb_lazy.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpb.cpp">\r
       <Filter>intrusive\split_list</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_rcu_gpb.cpp">\r
       <Filter>intrusive\split_list</Filter>\r
     </ClCompile>\r


@@ -167,33 +161,9 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_nogc.cpp">\r
       <Filter>container\split_list</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_nogc.cpp">\r
       <Filter>container\split_list</Filter>\r
     </ClCompile>\r

-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_ptb.cpp">\r
-      <Filter>container\split_list</Filter>\r
-    </ClCompile>\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_nogc.cpp">\r
       <Filter>container\split_list</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_nogc.cpp">\r
       <Filter>container\split_list</Filter>\r
     </ClCompile>\r

-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_ptb.cpp">\r
-      <Filter>container\split_list</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpb.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpi.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpt.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpb.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpi.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpt.cpp">\r
-      <Filter>intrusive\split_list</Filter>\r
-    </ClCompile>\r

     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_gpb.cpp">\r
       <Filter>intrusive\skip_list</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_skiplist_rcu_gpb.cpp">\r
       <Filter>intrusive\skip_list</Filter>\r
     </ClCompile>\r


@@ -311,5 +281,35 @@
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_michael_set_lazy_rcu_gpb.cpp">\r
       <Filter>container\michael_set</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_michael_set_lazy_rcu_gpb.cpp">\r
       <Filter>container\michael_set</Filter>\r
     </ClCompile>\r

+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_dhp.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_dhp.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_dhp.cpp">\r
+      <Filter>intrusive\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_intrusive_splitlist_set_dhp_lazy.cpp">\r
+      <Filter>intrusive\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpb.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpi.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_lazy_rcu_gpt.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpb.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpi.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\tests\test-hdr\set\hdr_splitlist_set_rcu_gpt.cpp">\r
+      <Filter>container\split_list</Filter>\r
+    </ClCompile>\r

   </ItemGroup>\r
 </Project>
\ No newline at end of file
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/tests/test-hdr/set/hdr_intrusive_set.h b/tests/test-hdr/set/hdr_intrusive_set.h
index 49645afc5eed86c94752a6d244791467b484c385..728cb0023b9acd3ae2419d2d406b1beaa7c75068 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_set.h
+++ b/tests/test-hdr/set/hdr_intrusive_set.h
@@ -1178,18 +1178,18 @@ namespace set {
         void split_st_HP_member_less();
         void split_st_HP_member_cmpmix();
 
         void split_st_HP_member_less();
         void split_st_HP_member_cmpmix();
 

-        void split_dyn_PTB_base_cmp();
-        void split_dyn_PTB_base_less();
-        void split_dyn_PTB_base_cmpmix();
-        void split_dyn_PTB_member_cmp();
-        void split_dyn_PTB_member_less();
-        void split_dyn_PTB_member_cmpmix();
-        void split_st_PTB_base_cmp();
-        void split_st_PTB_base_less();
-        void split_st_PTB_base_cmpmix();
-        void split_st_PTB_member_cmp();
-        void split_st_PTB_member_less();
-        void split_st_PTB_member_cmpmix();
+        void split_dyn_DHP_base_cmp();
+        void split_dyn_DHP_base_less();
+        void split_dyn_DHP_base_cmpmix();
+        void split_dyn_DHP_member_cmp();
+        void split_dyn_DHP_member_less();
+        void split_dyn_DHP_member_cmpmix();
+        void split_st_DHP_base_cmp();
+        void split_st_DHP_base_less();
+        void split_st_DHP_base_cmpmix();
+        void split_st_DHP_member_cmp();
+        void split_st_DHP_member_less();
+        void split_st_DHP_member_cmpmix();

 
         void split_dyn_RCU_GPI_base_cmp();
         void split_dyn_RCU_GPI_base_less();
 
         void split_dyn_RCU_GPI_base_cmp();
         void split_dyn_RCU_GPI_base_less();


@@ -1284,18 +1284,18 @@ namespace set {
         void split_st_HP_member_less_lazy();
         void split_st_HP_member_cmpmix_lazy();
 
         void split_st_HP_member_less_lazy();
         void split_st_HP_member_cmpmix_lazy();
 

-        void split_dyn_PTB_base_cmp_lazy();
-        void split_dyn_PTB_base_less_lazy();
-        void split_dyn_PTB_base_cmpmix_lazy();
-        void split_dyn_PTB_member_cmp_lazy();
-        void split_dyn_PTB_member_less_lazy();
-        void split_dyn_PTB_member_cmpmix_lazy();
-        void split_st_PTB_base_cmp_lazy();
-        void split_st_PTB_base_less_lazy();
-        void split_st_PTB_base_cmpmix_lazy();
-        void split_st_PTB_member_cmp_lazy();
-        void split_st_PTB_member_less_lazy();
-        void split_st_PTB_member_cmpmix_lazy();
+        void split_dyn_DHP_base_cmp_lazy();
+        void split_dyn_DHP_base_less_lazy();
+        void split_dyn_DHP_base_cmpmix_lazy();
+        void split_dyn_DHP_member_cmp_lazy();
+        void split_dyn_DHP_member_less_lazy();
+        void split_dyn_DHP_member_cmpmix_lazy();
+        void split_st_DHP_base_cmp_lazy();
+        void split_st_DHP_base_less_lazy();
+        void split_st_DHP_base_cmpmix_lazy();
+        void split_st_DHP_member_cmp_lazy();
+        void split_st_DHP_member_less_lazy();
+        void split_st_DHP_member_cmpmix_lazy();

 
         void split_dyn_RCU_GPI_base_cmp_lazy();
         void split_dyn_RCU_GPI_base_less_lazy();
 
         void split_dyn_RCU_GPI_base_cmp_lazy();
         void split_dyn_RCU_GPI_base_less_lazy();


@@ -1501,18 +1501,18 @@ namespace set {
             CPPUNIT_TEST(split_st_HP_member_less)
             CPPUNIT_TEST(split_st_HP_member_cmpmix)
 
             CPPUNIT_TEST(split_st_HP_member_less)
             CPPUNIT_TEST(split_st_HP_member_cmpmix)
 

-            CPPUNIT_TEST(split_dyn_PTB_base_cmp)
-            CPPUNIT_TEST(split_dyn_PTB_base_less)
-            CPPUNIT_TEST(split_dyn_PTB_base_cmpmix)
-            CPPUNIT_TEST(split_dyn_PTB_member_cmp)
-            CPPUNIT_TEST(split_dyn_PTB_member_less)
-            CPPUNIT_TEST(split_dyn_PTB_member_cmpmix)
-            CPPUNIT_TEST(split_st_PTB_base_cmp)
-            CPPUNIT_TEST(split_st_PTB_base_less)
-            CPPUNIT_TEST(split_st_PTB_base_cmpmix)
-            CPPUNIT_TEST(split_st_PTB_member_cmp)
-            CPPUNIT_TEST(split_st_PTB_member_less)
-            CPPUNIT_TEST(split_st_PTB_member_cmpmix)
+            CPPUNIT_TEST(split_dyn_DHP_base_cmp)
+            CPPUNIT_TEST(split_dyn_DHP_base_less)
+            CPPUNIT_TEST(split_dyn_DHP_base_cmpmix)
+            CPPUNIT_TEST(split_dyn_DHP_member_cmp)
+            CPPUNIT_TEST(split_dyn_DHP_member_less)
+            CPPUNIT_TEST(split_dyn_DHP_member_cmpmix)
+            CPPUNIT_TEST(split_st_DHP_base_cmp)
+            CPPUNIT_TEST(split_st_DHP_base_less)
+            CPPUNIT_TEST(split_st_DHP_base_cmpmix)
+            CPPUNIT_TEST(split_st_DHP_member_cmp)
+            CPPUNIT_TEST(split_st_DHP_member_less)
+            CPPUNIT_TEST(split_st_DHP_member_cmpmix)

 
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmp)
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_less)
 
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmp)
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_less)


@@ -1606,18 +1606,18 @@ namespace set {
             CPPUNIT_TEST(split_st_HP_member_less_lazy)
             CPPUNIT_TEST(split_st_HP_member_cmpmix_lazy)
 
             CPPUNIT_TEST(split_st_HP_member_less_lazy)
             CPPUNIT_TEST(split_st_HP_member_cmpmix_lazy)
 

-            CPPUNIT_TEST(split_dyn_PTB_base_cmp_lazy)
-            CPPUNIT_TEST(split_dyn_PTB_base_less_lazy)
-            CPPUNIT_TEST(split_dyn_PTB_base_cmpmix_lazy)
-            CPPUNIT_TEST(split_dyn_PTB_member_cmp_lazy)
-            CPPUNIT_TEST(split_dyn_PTB_member_less_lazy)
-            CPPUNIT_TEST(split_dyn_PTB_member_cmpmix_lazy)
-            CPPUNIT_TEST(split_st_PTB_base_cmp_lazy)
-            CPPUNIT_TEST(split_st_PTB_base_less_lazy)
-            CPPUNIT_TEST(split_st_PTB_base_cmpmix_lazy)
-            CPPUNIT_TEST(split_st_PTB_member_cmp_lazy)
-            CPPUNIT_TEST(split_st_PTB_member_less_lazy)
-            CPPUNIT_TEST(split_st_PTB_member_cmpmix_lazy)
+            CPPUNIT_TEST(split_dyn_DHP_base_cmp_lazy)
+            CPPUNIT_TEST(split_dyn_DHP_base_less_lazy)
+            CPPUNIT_TEST(split_dyn_DHP_base_cmpmix_lazy)
+            CPPUNIT_TEST(split_dyn_DHP_member_cmp_lazy)
+            CPPUNIT_TEST(split_dyn_DHP_member_less_lazy)
+            CPPUNIT_TEST(split_dyn_DHP_member_cmpmix_lazy)
+            CPPUNIT_TEST(split_st_DHP_base_cmp_lazy)
+            CPPUNIT_TEST(split_st_DHP_base_less_lazy)
+            CPPUNIT_TEST(split_st_DHP_base_cmpmix_lazy)
+            CPPUNIT_TEST(split_st_DHP_member_cmp_lazy)
+            CPPUNIT_TEST(split_st_DHP_member_less_lazy)
+            CPPUNIT_TEST(split_st_DHP_member_cmpmix_lazy)

 
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmp_lazy)
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_less_lazy)
 
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_cmp_lazy)
             CPPUNIT_TEST(split_dyn_RCU_GPI_base_less_lazy)

diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp
new file mode 100644 (file)
index 0000000..a4a368c
--- /dev/null
+++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp.cpp
@@ -0,0 +1,318 @@
+//$$CDS-header$$
+
+#include "set/hdr_intrusive_set.h"
+#include <cds/intrusive/michael_list_dhp.h>
+#include <cds/intrusive/split_list.h>
+
+namespace set {
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_base_cmp()
+    {
+        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<true>
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_base_less()
+    {
+        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_base_cmpmix()
+    {
+        typedef base_int_item< ci::split_list::node<ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+                ,ci::split_list::dynamic_bucket_table<true>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmp()
+    {
+        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_member_less()
+    {
+        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmpmix()
+    {
+        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+
+    // Static bucket table
+    void IntrusiveHashSetHdrTest::split_st_DHP_base_cmp()
+    {
+        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<false>
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_base_less()
+    {
+        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<false>
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_base_cmpmix()
+    {
+        typedef base_int_item< ci::split_list::node<ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+                ,ci::split_list::dynamic_bucket_table<false>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_member_cmp()
+    {
+        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<false>
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_member_less()
+    {
+        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                ci::split_list::dynamic_bucket_table<false>
+                ,co::hash< hash_int >
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_member_cmpmix()
+    {
+        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::DHP> > > item;
+        typedef ci::MichaelList< cds::gc::DHP
+            ,item
+            ,ci::michael_list::make_traits<
+                ci::opt::hook< ci::michael_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+                ,ci::split_list::dynamic_bucket_table<false>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+
+} // namespace set

diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp
new file mode 100644 (file)
index 0000000..e0ad448
--- /dev/null
+++ b/tests/test-hdr/set/hdr_intrusive_splitlist_set_dhp_lazy.cpp
@@ -0,0 +1,318 @@
+//$$CDS-header$$
+
+#include "set/hdr_intrusive_set.h"
+#include <cds/intrusive/lazy_list_dhp.h>
+#include <cds/intrusive/split_list.h>
+
+namespace set {
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_base_cmp_lazy()
+    {
+        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<true>
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_base_less_lazy()
+    {
+        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_base_cmpmix_lazy()
+    {
+        typedef base_int_item< ci::split_list::node<ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+                ,ci::split_list::dynamic_bucket_table<true>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmp_lazy()
+    {
+        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_member_less_lazy()
+    {
+        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_dyn_DHP_member_cmpmix_lazy()
+    {
+        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+            >::type
+        > set;
+        static_assert( set::traits::dynamic_bucket_table, "Set has static bucket table" );
+
+        test_int<set>();
+    }
+
+
+    // Static bucket table
+    void IntrusiveHashSetHdrTest::split_st_DHP_base_cmp_lazy()
+    {
+        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<false>
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_base_less_lazy()
+    {
+        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<false>
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_base_cmpmix_lazy()
+    {
+        typedef base_int_item< ci::split_list::node<ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::DHP> > >
+                ,co::less< less<item> >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+                ,ci::split_list::dynamic_bucket_table<false>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_member_cmp_lazy()
+    {
+        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,ci::split_list::dynamic_bucket_table<false>
+                ,co::memory_model<co::v::relaxed_ordering>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_member_less_lazy()
+    {
+        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                ci::split_list::dynamic_bucket_table<false>
+                ,co::hash< hash_int >
+                ,co::memory_model<co::v::sequential_consistent>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+    void IntrusiveHashSetHdrTest::split_st_DHP_member_cmpmix_lazy()
+    {
+        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::DHP> > > item;
+        typedef ci::LazyList< cds::gc::DHP
+            ,item
+            ,ci::lazy_list::make_traits<
+                ci::opt::hook< ci::lazy_list::member_hook<
+                    offsetof( item, hMember ),
+                    co::gc<cds::gc::DHP>
+                > >
+                ,co::compare< cmp<item> >
+                ,co::less< less<item> >
+                ,ci::opt::disposer< faked_disposer >
+            >::type
+        >    ord_list;
+
+        typedef ci::SplitListSet< cds::gc::DHP, ord_list,
+            ci::split_list::make_traits<
+                co::hash< hash_int >
+                ,co::item_counter< simple_item_counter >
+                ,ci::split_list::dynamic_bucket_table<false>
+            >::type
+        > set;
+        static_assert( !set::traits::dynamic_bucket_table, "Set has dynamic bucket table" );
+
+        test_int<set>();
+    }
+
+
+} // namespace set

diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
deleted file mode 100644 (file)
index 01181eb..0000000
--- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-//$$CDS-header$$
-
-#include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/michael_list_dhp.h>
-#include <cds/intrusive/split_list.h>
-
-namespace set {
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_base_cmp()
-    {
-        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<true>
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_base_less()
-    {
-        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_base_cmpmix()
-    {
-        typedef base_int_item< ci::split_list::node<ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-                ,ci::split_list::dynamic_bucket_table<true>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_member_cmp()
-    {
-        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_member_less()
-    {
-        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_member_cmpmix()
-    {
-        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-
-    // Static bucket table
-    void IntrusiveHashSetHdrTest::split_st_PTB_base_cmp()
-    {
-        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<false>
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_base_less()
-    {
-        typedef base_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<false>
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_base_cmpmix()
-    {
-        typedef base_int_item< ci::split_list::node<ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-                ,ci::split_list::dynamic_bucket_table<false>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_member_cmp()
-    {
-        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<false>
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_member_less()
-    {
-        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                ci::split_list::dynamic_bucket_table<false>
-                ,co::hash< hash_int >
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_member_cmpmix()
-    {
-        typedef member_int_item< ci::split_list::node< ci::michael_list::node<cds::gc::PTB> > > item;
-        typedef ci::MichaelList< cds::gc::PTB
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-                ,ci::split_list::dynamic_bucket_table<false>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-
-} // namespace set

diff --git a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp b/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp
deleted file mode 100644 (file)
index 86879e7..0000000
--- a/tests/test-hdr/set/hdr_intrusive_splitlist_set_ptb_lazy.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-//$$CDS-header$$
-
-#include "set/hdr_intrusive_set.h"
-#include <cds/intrusive/lazy_list_dhp.h>
-#include <cds/intrusive/split_list.h>
-
-namespace set {
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_base_cmp_lazy()
-    {
-        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<true>
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_base_less_lazy()
-    {
-        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_base_cmpmix_lazy()
-    {
-        typedef base_int_item< ci::split_list::node<ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-                ,ci::split_list::dynamic_bucket_table<true>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_member_cmp_lazy()
-    {
-        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_member_less_lazy()
-    {
-        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_dyn_PTB_member_cmpmix_lazy()
-    {
-        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-            >::type
-        > set;
-        static_assert( set::options::dynamic_bucket_table, "Set has static bucket table" );
-
-        test_int<set>();
-    }
-
-
-    // Static bucket table
-    void IntrusiveHashSetHdrTest::split_st_PTB_base_cmp_lazy()
-    {
-        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<false>
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_base_less_lazy()
-    {
-        typedef base_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<false>
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_base_cmpmix_lazy()
-    {
-        typedef base_int_item< ci::split_list::node<ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::base_hook< co::gc<cds::gc::PTB> > >
-                ,co::less< less<item> >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-                ,ci::split_list::dynamic_bucket_table<false>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_member_cmp_lazy()
-    {
-        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,ci::split_list::dynamic_bucket_table<false>
-                ,co::memory_model<co::v::relaxed_ordering>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_member_less_lazy()
-    {
-        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                ci::split_list::dynamic_bucket_table<false>
-                ,co::hash< hash_int >
-                ,co::memory_model<co::v::sequential_consistent>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-    void IntrusiveHashSetHdrTest::split_st_PTB_member_cmpmix_lazy()
-    {
-        typedef member_int_item< ci::split_list::node< ci::lazy_list::node<cds::gc::PTB> > > item;
-        typedef ci::LazyList< cds::gc::PTB
-            ,item
-            ,ci::lazy_list::make_traits<
-                ci::opt::hook< ci::lazy_list::member_hook<
-                    offsetof( item, hMember ),
-                    co::gc<cds::gc::PTB>
-                > >
-                ,co::compare< cmp<item> >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    ord_list;
-
-        typedef ci::SplitListSet< cds::gc::PTB, ord_list,
-            ci::split_list::make_traits<
-                co::hash< hash_int >
-                ,co::item_counter< simple_item_counter >
-                ,ci::split_list::dynamic_bucket_table<false>
-            >::type
-        > set;
-        static_assert( !set::options::dynamic_bucket_table, "Set has dynamic bucket table" );
-
-        test_int<set>();
-    }
-
-
-} // namespace set

diff --git a/tests/test-hdr/set/hdr_set.h b/tests/test-hdr/set/hdr_set.h
index 14792f32d37d00fe47c8df237d7cb1f83c0fe1e2..997be244c3f1e4e0a3cb515f2b4e8a327e016412 100644 (file)
--- a/tests/test-hdr/set/hdr_set.h
+++ b/tests/test-hdr/set/hdr_set.h
@@ -889,9 +889,9 @@ namespace set {
         void Split_HP_less();
         void Split_HP_cmpmix();
 
         void Split_HP_less();
         void Split_HP_cmpmix();
 

-        void Split_PTB_cmp();
-        void Split_PTB_less();
-        void Split_PTB_cmpmix();
+        void Split_DHP_cmp();
+        void Split_DHP_less();
+        void Split_DHP_cmpmix();

 
         void Split_RCU_GPI_cmp();
         void Split_RCU_GPI_less();
 
         void Split_RCU_GPI_cmp();
         void Split_RCU_GPI_less();


@@ -922,9 +922,9 @@ namespace set {
         void Split_Lazy_HP_less();
         void Split_Lazy_HP_cmpmix();
 
         void Split_Lazy_HP_less();
         void Split_Lazy_HP_cmpmix();
 

-        void Split_Lazy_PTB_cmp();
-        void Split_Lazy_PTB_less();
-        void Split_Lazy_PTB_cmpmix();
+        void Split_Lazy_DHP_cmp();
+        void Split_Lazy_DHP_less();
+        void Split_Lazy_DHP_cmpmix();

 
         void Split_Lazy_RCU_GPI_cmp();
         void Split_Lazy_RCU_GPI_less();
 
         void Split_Lazy_RCU_GPI_cmp();
         void Split_Lazy_RCU_GPI_less();


@@ -1019,9 +1019,9 @@ namespace set {
             CPPUNIT_TEST(Split_HP_less)
             CPPUNIT_TEST(Split_HP_cmpmix)
 
             CPPUNIT_TEST(Split_HP_less)
             CPPUNIT_TEST(Split_HP_cmpmix)
 

-            CPPUNIT_TEST(Split_PTB_cmp)
-            CPPUNIT_TEST(Split_PTB_less)
-            CPPUNIT_TEST(Split_PTB_cmpmix)
+            CPPUNIT_TEST(Split_DHP_cmp)
+            CPPUNIT_TEST(Split_DHP_less)
+            CPPUNIT_TEST(Split_DHP_cmpmix)

 
             CPPUNIT_TEST(Split_RCU_GPI_cmp)
             CPPUNIT_TEST(Split_RCU_GPI_less)
 
             CPPUNIT_TEST(Split_RCU_GPI_cmp)
             CPPUNIT_TEST(Split_RCU_GPI_less)


@@ -1051,9 +1051,9 @@ namespace set {
             CPPUNIT_TEST(Split_Lazy_HP_less)
             CPPUNIT_TEST(Split_Lazy_HP_cmpmix)
 
             CPPUNIT_TEST(Split_Lazy_HP_less)
             CPPUNIT_TEST(Split_Lazy_HP_cmpmix)
 

-            CPPUNIT_TEST(Split_Lazy_PTB_cmp)
-            CPPUNIT_TEST(Split_Lazy_PTB_less)
-            CPPUNIT_TEST(Split_Lazy_PTB_cmpmix)
+            CPPUNIT_TEST(Split_Lazy_DHP_cmp)
+            CPPUNIT_TEST(Split_Lazy_DHP_less)
+            CPPUNIT_TEST(Split_Lazy_DHP_cmpmix)

 
             CPPUNIT_TEST(Split_Lazy_RCU_GPI_cmp)
             CPPUNIT_TEST(Split_Lazy_RCU_GPI_less)
 
             CPPUNIT_TEST(Split_Lazy_RCU_GPI_cmp)
             CPPUNIT_TEST(Split_Lazy_RCU_GPI_less)

diff --git a/tests/test-hdr/set/hdr_splitlist_set_dhp.cpp b/tests/test-hdr/set/hdr_splitlist_set_dhp.cpp
new file mode 100644 (file)
index 0000000..058c946
--- /dev/null
+++ b/tests/test-hdr/set/hdr_splitlist_set_dhp.cpp
@@ -0,0 +1,128 @@
+//$$CDS-header$$
+
+#include "set/hdr_set.h"
+#include <cds/container/michael_list_dhp.h>
+#include <cds/container/split_list_set.h>
+
+namespace set {
+
+    namespace {
+        struct PTB_cmp_traits: public cc::split_list::type_traits
+        {
+            typedef cc::michael_list_tag                ordered_list;
+            typedef HashSetHdrTest::hash_int            hash;
+            typedef HashSetHdrTest::simple_item_counter item_counter;
+            typedef cc::opt::v::relaxed_ordering        memory_model;
+            enum { dynamic_bucket_table = false };
+
+            struct ordered_list_traits: public cc::michael_list::type_traits
+            {
+                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
+            };
+        };
+
+        struct PTB_less_traits: public cc::split_list::type_traits
+        {
+            typedef cc::michael_list_tag                ordered_list;
+            typedef HashSetHdrTest::hash_int            hash;
+            typedef HashSetHdrTest::simple_item_counter item_counter;
+            typedef cc::opt::v::sequential_consistent   memory_model;
+            enum { dynamic_bucket_table = false };
+
+            struct ordered_list_traits: public cc::michael_list::type_traits
+            {
+                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
+            };
+        };
+
+        struct PTB_cmpmix_traits: public cc::split_list::type_traits
+        {
+            typedef cc::michael_list_tag                ordered_list;
+            typedef HashSetHdrTest::hash_int            hash;
+            typedef HashSetHdrTest::simple_item_counter item_counter;
+
+            struct ordered_list_traits: public cc::michael_list::type_traits
+            {
+                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
+                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
+            };
+        };
+    }
+
+    void HashSetHdrTest::Split_PTB_cmp()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmp_traits > set;
+
+        test_int< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::michael_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cc::opt::memory_model< cc::opt::v::relaxed_ordering >
+                ,cc::split_list::dynamic_bucket_table< true >
+                ,cc::split_list::ordered_list_traits<
+                    cc::michael_list::make_traits<
+                        cc::opt::compare< cmp<item> >
+                    >::type
+                >
+            >::type
+        > opt_set;
+        test_int< opt_set >();
+    }
+
+    void HashSetHdrTest::Split_PTB_less()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_less_traits > set;
+
+        test_int< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::michael_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cc::opt::memory_model< cc::opt::v::sequential_consistent >
+                ,cc::split_list::dynamic_bucket_table< false >
+                ,cc::split_list::ordered_list_traits<
+                    cc::michael_list::make_traits<
+                        cc::opt::less< less<item> >
+                    >::type
+                >
+            >::type
+        > opt_set;
+        test_int< opt_set >();
+    }
+
+    void HashSetHdrTest::Split_PTB_cmpmix()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmpmix_traits > set;
+        test_int< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::michael_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cc::split_list::ordered_list_traits<
+                    cc::michael_list::make_traits<
+                        cc::opt::less< less<item> >
+                        ,cc::opt::compare< cmp<item> >
+                    >::type
+                >
+            >::type
+        > opt_set;
+        test_int< opt_set >();
+    }
+
+
+} // namespace set
+
+

diff --git a/tests/test-hdr/set/hdr_splitlist_set_lazy_dhp.cpp b/tests/test-hdr/set/hdr_splitlist_set_lazy_dhp.cpp
new file mode 100644 (file)
index 0000000..6195103
--- /dev/null
+++ b/tests/test-hdr/set/hdr_splitlist_set_lazy_dhp.cpp
@@ -0,0 +1,128 @@
+//$$CDS-header$$
+
+#include "set/hdr_set.h"
+#include <cds/container/lazy_list_dhp.h>
+#include <cds/container/split_list_set.h>
+
+namespace set {
+
+    namespace {
+        struct PTB_cmp_traits: public cc::split_list::type_traits
+        {
+            typedef cc::lazy_list_tag                   ordered_list;
+            typedef HashSetHdrTest::hash_int            hash;
+            typedef HashSetHdrTest::simple_item_counter item_counter;
+            typedef cc::opt::v::relaxed_ordering        memory_model;
+            enum { dynamic_bucket_table = false };
+
+            struct ordered_list_traits: public cc::lazy_list::type_traits
+            {
+                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
+            };
+        };
+
+        struct PTB_less_traits: public cc::split_list::type_traits
+        {
+            typedef cc::lazy_list_tag                ordered_list;
+            typedef HashSetHdrTest::hash_int            hash;
+            typedef HashSetHdrTest::simple_item_counter item_counter;
+            typedef cc::opt::v::sequential_consistent                      memory_model;
+            enum { dynamic_bucket_table = false };
+
+            struct ordered_list_traits: public cc::lazy_list::type_traits
+            {
+                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
+            };
+        };
+
+        struct PTB_cmpmix_traits: public cc::split_list::type_traits
+        {
+            typedef cc::lazy_list_tag                ordered_list;
+            typedef HashSetHdrTest::hash_int            hash;
+            typedef HashSetHdrTest::simple_item_counter item_counter;
+
+            struct ordered_list_traits: public cc::lazy_list::type_traits
+            {
+                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
+                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
+            };
+        };
+    }
+
+    void HashSetHdrTest::Split_Lazy_PTB_cmp()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmp_traits > set;
+
+        test_int< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::lazy_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cc::opt::memory_model< cc::opt::v::relaxed_ordering >
+                ,cc::split_list::dynamic_bucket_table< true >
+                ,cc::split_list::ordered_list_traits<
+                    cc::lazy_list::make_traits<
+                        cc::opt::compare< cmp<item> >
+                    >::type
+                >
+            >::type
+        > opt_set;
+        test_int< opt_set >();
+    }
+
+    void HashSetHdrTest::Split_Lazy_PTB_less()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_less_traits > set;
+
+        test_int< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::lazy_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cc::opt::memory_model< cc::opt::v::sequential_consistent >
+                ,cc::split_list::dynamic_bucket_table< false >
+                ,cc::split_list::ordered_list_traits<
+                    cc::lazy_list::make_traits<
+                        cc::opt::less< less<item> >
+                    >::type
+                >
+            >::type
+        > opt_set;
+        test_int< opt_set >();
+    }
+
+    void HashSetHdrTest::Split_Lazy_PTB_cmpmix()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmpmix_traits > set;
+        test_int< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< cds::gc::PTB, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::lazy_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cc::split_list::ordered_list_traits<
+                    cc::lazy_list::make_traits<
+                        cc::opt::less< less<item> >
+                        ,cc::opt::compare< cmp<item> >
+                    >::type
+                >
+            >::type
+        > opt_set;
+        test_int< opt_set >();
+    }
+
+
+} // namespace set
+
+

diff --git a/tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp b/tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp
deleted file mode 100644 (file)
index 6195103..0000000
--- a/tests/test-hdr/set/hdr_splitlist_set_lazy_ptb.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//$$CDS-header$$
-
-#include "set/hdr_set.h"
-#include <cds/container/lazy_list_dhp.h>
-#include <cds/container/split_list_set.h>
-
-namespace set {
-
-    namespace {
-        struct PTB_cmp_traits: public cc::split_list::type_traits
-        {
-            typedef cc::lazy_list_tag                   ordered_list;
-            typedef HashSetHdrTest::hash_int            hash;
-            typedef HashSetHdrTest::simple_item_counter item_counter;
-            typedef cc::opt::v::relaxed_ordering        memory_model;
-            enum { dynamic_bucket_table = false };
-
-            struct ordered_list_traits: public cc::lazy_list::type_traits
-            {
-                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
-            };
-        };
-
-        struct PTB_less_traits: public cc::split_list::type_traits
-        {
-            typedef cc::lazy_list_tag                ordered_list;
-            typedef HashSetHdrTest::hash_int            hash;
-            typedef HashSetHdrTest::simple_item_counter item_counter;
-            typedef cc::opt::v::sequential_consistent                      memory_model;
-            enum { dynamic_bucket_table = false };
-
-            struct ordered_list_traits: public cc::lazy_list::type_traits
-            {
-                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
-            };
-        };
-
-        struct PTB_cmpmix_traits: public cc::split_list::type_traits
-        {
-            typedef cc::lazy_list_tag                ordered_list;
-            typedef HashSetHdrTest::hash_int            hash;
-            typedef HashSetHdrTest::simple_item_counter item_counter;
-
-            struct ordered_list_traits: public cc::lazy_list::type_traits
-            {
-                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
-                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
-            };
-        };
-    }
-
-    void HashSetHdrTest::Split_Lazy_PTB_cmp()
-    {
-        // traits-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmp_traits > set;
-
-        test_int< set >();
-
-        // option-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item,
-            cc::split_list::make_traits<
-                cc::split_list::ordered_list<cc::lazy_list_tag>
-                ,cc::opt::hash< hash_int >
-                ,cc::opt::item_counter< simple_item_counter >
-                ,cc::opt::memory_model< cc::opt::v::relaxed_ordering >
-                ,cc::split_list::dynamic_bucket_table< true >
-                ,cc::split_list::ordered_list_traits<
-                    cc::lazy_list::make_traits<
-                        cc::opt::compare< cmp<item> >
-                    >::type
-                >
-            >::type
-        > opt_set;
-        test_int< opt_set >();
-    }
-
-    void HashSetHdrTest::Split_Lazy_PTB_less()
-    {
-        // traits-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_less_traits > set;
-
-        test_int< set >();
-
-        // option-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item,
-            cc::split_list::make_traits<
-                cc::split_list::ordered_list<cc::lazy_list_tag>
-                ,cc::opt::hash< hash_int >
-                ,cc::opt::item_counter< simple_item_counter >
-                ,cc::opt::memory_model< cc::opt::v::sequential_consistent >
-                ,cc::split_list::dynamic_bucket_table< false >
-                ,cc::split_list::ordered_list_traits<
-                    cc::lazy_list::make_traits<
-                        cc::opt::less< less<item> >
-                    >::type
-                >
-            >::type
-        > opt_set;
-        test_int< opt_set >();
-    }
-
-    void HashSetHdrTest::Split_Lazy_PTB_cmpmix()
-    {
-        // traits-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmpmix_traits > set;
-        test_int< set >();
-
-        // option-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item,
-            cc::split_list::make_traits<
-                cc::split_list::ordered_list<cc::lazy_list_tag>
-                ,cc::opt::hash< hash_int >
-                ,cc::opt::item_counter< simple_item_counter >
-                ,cc::split_list::ordered_list_traits<
-                    cc::lazy_list::make_traits<
-                        cc::opt::less< less<item> >
-                        ,cc::opt::compare< cmp<item> >
-                    >::type
-                >
-            >::type
-        > opt_set;
-        test_int< opt_set >();
-    }
-
-
-} // namespace set
-
-

diff --git a/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp b/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
deleted file mode 100644 (file)
index 058c946..0000000
--- a/tests/test-hdr/set/hdr_splitlist_set_ptb.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//$$CDS-header$$
-
-#include "set/hdr_set.h"
-#include <cds/container/michael_list_dhp.h>
-#include <cds/container/split_list_set.h>
-
-namespace set {
-
-    namespace {
-        struct PTB_cmp_traits: public cc::split_list::type_traits
-        {
-            typedef cc::michael_list_tag                ordered_list;
-            typedef HashSetHdrTest::hash_int            hash;
-            typedef HashSetHdrTest::simple_item_counter item_counter;
-            typedef cc::opt::v::relaxed_ordering        memory_model;
-            enum { dynamic_bucket_table = false };
-
-            struct ordered_list_traits: public cc::michael_list::type_traits
-            {
-                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
-            };
-        };
-
-        struct PTB_less_traits: public cc::split_list::type_traits
-        {
-            typedef cc::michael_list_tag                ordered_list;
-            typedef HashSetHdrTest::hash_int            hash;
-            typedef HashSetHdrTest::simple_item_counter item_counter;
-            typedef cc::opt::v::sequential_consistent   memory_model;
-            enum { dynamic_bucket_table = false };
-
-            struct ordered_list_traits: public cc::michael_list::type_traits
-            {
-                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
-            };
-        };
-
-        struct PTB_cmpmix_traits: public cc::split_list::type_traits
-        {
-            typedef cc::michael_list_tag                ordered_list;
-            typedef HashSetHdrTest::hash_int            hash;
-            typedef HashSetHdrTest::simple_item_counter item_counter;
-
-            struct ordered_list_traits: public cc::michael_list::type_traits
-            {
-                typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
-                typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
-            };
-        };
-    }
-
-    void HashSetHdrTest::Split_PTB_cmp()
-    {
-        // traits-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmp_traits > set;
-
-        test_int< set >();
-
-        // option-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item,
-            cc::split_list::make_traits<
-                cc::split_list::ordered_list<cc::michael_list_tag>
-                ,cc::opt::hash< hash_int >
-                ,cc::opt::item_counter< simple_item_counter >
-                ,cc::opt::memory_model< cc::opt::v::relaxed_ordering >
-                ,cc::split_list::dynamic_bucket_table< true >
-                ,cc::split_list::ordered_list_traits<
-                    cc::michael_list::make_traits<
-                        cc::opt::compare< cmp<item> >
-                    >::type
-                >
-            >::type
-        > opt_set;
-        test_int< opt_set >();
-    }
-
-    void HashSetHdrTest::Split_PTB_less()
-    {
-        // traits-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_less_traits > set;
-
-        test_int< set >();
-
-        // option-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item,
-            cc::split_list::make_traits<
-                cc::split_list::ordered_list<cc::michael_list_tag>
-                ,cc::opt::hash< hash_int >
-                ,cc::opt::item_counter< simple_item_counter >
-                ,cc::opt::memory_model< cc::opt::v::sequential_consistent >
-                ,cc::split_list::dynamic_bucket_table< false >
-                ,cc::split_list::ordered_list_traits<
-                    cc::michael_list::make_traits<
-                        cc::opt::less< less<item> >
-                    >::type
-                >
-            >::type
-        > opt_set;
-        test_int< opt_set >();
-    }
-
-    void HashSetHdrTest::Split_PTB_cmpmix()
-    {
-        // traits-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item, PTB_cmpmix_traits > set;
-        test_int< set >();
-
-        // option-based version
-        typedef cc::SplitListSet< cds::gc::PTB, item,
-            cc::split_list::make_traits<
-                cc::split_list::ordered_list<cc::michael_list_tag>
-                ,cc::opt::hash< hash_int >
-                ,cc::opt::item_counter< simple_item_counter >
-                ,cc::split_list::ordered_list_traits<
-                    cc::michael_list::make_traits<
-                        cc::opt::less< less<item> >
-                        ,cc::opt::compare< cmp<item> >
-                    >::type
-                >
-            >::type
-        > opt_set;
-        test_int< opt_set >();
-    }
-
-
-} // namespace set
-
-