From: khizmax <libcds.dev@gmail.com>
Date: Sat, 5 Sep 2015 13:16:30 +0000 (+0300)
Subject: Refactored Map_insdel_int MT-test
X-Git-Tag: v2.1.0~138
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bcdfd59db560213caf15537dd8ea5ce5eb222232;p=libcds.git

Refactored Map_insdel_int MT-test
Removed cds/opt/make_option_var.h, its content is moved to cds/opt/options.h
---

diff --git a/cds/container/striped_map.h b/cds/container/striped_map.h
index 17864e1b..a40e5d31 100644
--- a/cds/container/striped_map.h
+++ b/cds/container/striped_map.h
@@ -68,19 +68,19 @@ namespace cds { namespace container {
         among \p Options template arguments.
 
         The \p Options are:
-            - \p opt::mutex_policy - concurrent access policy.
-                Available policies: \p intrusive::striped_set::striping, \p intrusive::striped_set::refinable.
-                Default is %striped_set::striping.
-            - \p opt::hash - hash functor. Default option value see <tt>opt::v::hash_selector<opt::none> </tt>
+            - \p cds::opt::mutex_policy - concurrent access policy.
+                Available policies: \p striped_set::striping, \p striped_set::refinable.
+                Default is \p %striped_set::striping.
+            - \p cds::opt::hash - hash functor. Default option value see <tt>opt::v::hash_selector<opt::none> </tt>
                 which selects default hash functor for your compiler.
-            - \p opt::compare - key comparison functor. No default functor is provided.
+            - \p cds::opt::compare - key comparison functor. No default functor is provided.
                 If the option is not specified, the \p %opt::less is used.
-            - \p opt::less - specifies binary predicate used for key comparison. Default is \p std::less<T>.
-            - \p opt::item_counter - item counter type. Default is \p atomicity::item_counter since some operation on the counter is performed
+            - \p cds::opt::less - specifies binary predicate used for key comparison. Default is \p std::less<T>.
+            - \p cds::opt::item_counter - item counter type. Default is \p atomicity::item_counter since some operation on the counter is performed
                 without locks. Note that item counting is an essential part of the map algorithm, so dummy counter
                 like as \p atomicity::empty_item_counter is not suitable.
-            - \p opt::allocator - the allocator type using for memory allocation of bucket table and lock array. Default is \ref CDS_DEFAULT_ALLOCATOR.
-            - \p opt::resizing_policy - the resizing policy that is a functor that decides when to resize the hash map.
+            - \p cds::opt::allocator - the allocator type using for memory allocation of bucket table and lock array. Default is \ref CDS_DEFAULT_ALLOCATOR.
+            - \p cds::opt::resizing_policy - the resizing policy that is a functor that decides when to resize the hash map.
                 Default option value depends on bucket container type:
                     for sequential containers like \p std::list, \p std::vector the resizing policy is <tt>striped_set::load_factor_resizing<4> </tt>;
                     for other type of containers like \p std::map, \p std::unordered_map the resizing policy is \p striped_set::no_resizing.
@@ -90,7 +90,7 @@ namespace cds { namespace container {
                 significantly improve performance.
                 For other, non-sequential types of \p Container (like a \p std::map)
                 the resizing policy is not so important.
-            - \p opt::copy_policy - the copy policy which is used to copy items from the old map to the new one when resizing.
+            - \p cds::opt::copy_policy - the copy policy which is used to copy items from the old map to the new one when resizing.
                 The policy can be optionally used in adapted bucket container for performance reasons of resizing.
                 The detail of copy algorithm depends on type of bucket container and explains below.
 
@@ -491,9 +491,6 @@ template <class Container, typename... Options>
         typedef typename base_class::allocator_type     allocator_type  ; ///< allocator type specified in options.
         typedef typename base_class::mutex_policy       mutex_policy    ; ///< Mutex policy
 
-        //@cond
-        typedef cds::container::striped_set::implementation_tag implementation_tag;
-        //@endcond
     protected:
         //@cond
         typedef typename base_class::scoped_cell_lock   scoped_cell_lock;
diff --git a/cds/container/striped_set.h b/cds/container/striped_set.h
index af53836a..c1828458 100644
--- a/cds/container/striped_set.h
+++ b/cds/container/striped_set.h
@@ -482,10 +482,6 @@ namespace cds { namespace container {
         typedef typename base_class::allocator_type     allocator_type  ; ///< allocator type specified in options.
         typedef typename base_class::mutex_policy       mutex_policy    ; ///< Mutex policy
 
-        //@cond
-        typedef cds::container::striped_set::implementation_tag implementation_tag;
-        //@endcond
-
     protected:
         //@cond
         typedef typename base_class::scoped_cell_lock   scoped_cell_lock;
diff --git a/cds/container/striped_set/adapter.h b/cds/container/striped_set/adapter.h
index 72b78908..b6deb8cc 100644
--- a/cds/container/striped_set/adapter.h
+++ b/cds/container/striped_set/adapter.h
@@ -9,7 +9,6 @@
 namespace cds { namespace container {
     /// Striped hash set related definitions
     namespace striped_set {
-        using cds::intrusive::striped_set::implementation_tag;
 
         //@cond
         struct copy_item    ;   // copy_item_policy tag
@@ -178,15 +177,34 @@ namespace cds { namespace container {
         //@cond
         using cds::intrusive::striped_set::adapted_sequential_container;
         using cds::intrusive::striped_set::adapted_container;
+        //@endcond
 
-        using cds::intrusive::striped_set::load_factor_resizing;
-        using cds::intrusive::striped_set::rational_load_factor_resizing;
-        using cds::intrusive::striped_set::single_bucket_size_threshold;
-        using cds::intrusive::striped_set::no_resizing;
+        ///@copydoc cds::intrusive::striped_set::load_factor_resizing
+        template <size_t LoadFactor>
+        using load_factor_resizing = cds::intrusive::striped_set::load_factor_resizing<LoadFactor>;
 
-        using cds::intrusive::striped_set::striping;
-        using cds::intrusive::striped_set::refinable;
-        //@endcond
+        ///@copydoc cds::intrusive::striped_set::rational_load_factor_resizing
+        template <size_t Numerator, size_t Denominator = 1>
+        using rational_load_factor_resizing = cds::intrusive::striped_set::rational_load_factor_resizing<Numerator, Denominator>;
+
+        ///@copydoc cds::intrusive::striped_set::single_bucket_size_threshold
+        template <size_t Threshold>
+        using single_bucket_size_threshold = cds::intrusive::striped_set::single_bucket_size_threshold<Threshold>;
+
+        ///@copydoc cds::intrusive::striped_set::no_resizing
+        typedef cds::intrusive::striped_set::no_resizing no_resizing;
+
+        ///@copydoc cds::intrusive::striped_set::striping
+        template <class Lock = std::mutex, class Alloc = CDS_DEFAULT_ALLOCATOR >
+        using striping = cds::intrusive::striped_set::striping<Lock, Alloc>;
+
+        ///@copydoc cds::intrusive::striped_set::refinable
+        template <
+            class RecursiveLock = std::recursive_mutex,
+            typename BackOff = cds::backoff::yield,
+            class Alloc = CDS_DEFAULT_ALLOCATOR
+        > 
+        using refinable = cds::intrusive::striped_set::refinable<RecursiveLock, BackOff, Alloc >;
 
         //@cond
         namespace details {
diff --git a/cds/opt/make_options_var.h b/cds/opt/make_options_var.h
deleted file mode 100644
index cbcdd96d..00000000
--- a/cds/opt/make_options_var.h
+++ /dev/null
@@ -1,301 +0,0 @@
-//$$CDS-header$$
-
-#ifndef CDSLIB_OPT_MAKE_OPTIONS_VAR_H
-#define CDSLIB_OPT_MAKE_OPTIONS_VAR_H
-
-#ifndef CDSLIB_OPT_OPTIONS_H
-#   error <cds/opt/options.h> must be included instead of <cds/opt/make_options_var.h>
-#endif
-
-namespace cds { namespace opt {
-
-    //@cond
-    namespace details {
-        template <typename OptionList, typename Option>
-        struct do_pack
-        {
-            // Use "pack" member template to pack options
-            typedef typename Option::template pack<OptionList> type;
-        };
-
-        template <typename ...T> class typelist;
-
-        template <typename Typelist> struct typelist_head;
-        template <typename Head, typename ...Tail>
-        struct typelist_head< typelist<Head, Tail...> > {
-            typedef Head type;
-        };
-        template <typename Head>
-        struct typelist_head< typelist<Head> > {
-            typedef Head type;
-        };
-
-        template <typename Typelist> struct typelist_tail;
-        template <typename Head, typename ...Tail>
-        struct typelist_tail< typelist<Head, Tail...> > {
-            typedef typelist<Tail...> type;
-        };
-        template <typename Head>
-        struct typelist_tail< typelist<Head> > {
-            typedef typelist<> type;
-        };
-
-        template <typename OptionList, typename Typelist>
-        struct make_options_impl {
-            typedef typename make_options_impl<
-                typename do_pack<
-                    OptionList,
-                    typename typelist_head< Typelist >::type
-                >::type,
-                typename typelist_tail<Typelist>::type
-            >::type type;
-        };
-
-        template <typename OptionList>
-        struct make_options_impl<OptionList, typelist<> > {
-            typedef OptionList type;
-        };
-    }   // namespace details
-    //@endcond
-
-    /// make_options metafunction
-    /** @headerfile cds/opt/options.h
-
-        The metafunction converts option list \p Options to traits structure.
-        The result of metafunction is \p type.
-
-        Template parameter \p OptionList is default option set (default traits).
-        \p Options is option list.
-    */
-    template <typename OptionList, typename... Options>
-    struct make_options {
-#ifdef CDS_DOXYGEN_INVOKED
-        typedef implementation_defined type ;   ///< Result of the metafunction
-#else
-        typedef typename details::make_options_impl< OptionList, details::typelist<Options...> >::type type;
-#endif
-    };
-
-
-    // *****************************************************************
-    // find_type_traits metafunction
-    // *****************************************************************
-
-    //@cond
-    namespace details {
-        template <typename... Options>
-        struct find_type_traits_option;
-
-        template <>
-        struct find_type_traits_option<> {
-            typedef cds::opt::none  type;
-        };
-
-        template <typename Any>
-        struct find_type_traits_option< Any > {
-            typedef cds::opt::none type;
-        };
-
-        template <typename Any>
-        struct find_type_traits_option< cds::opt::type_traits< Any > > {
-            typedef Any type;
-        };
-
-        template <typename Any, typename... Options>
-        struct find_type_traits_option< cds::opt::type_traits< Any >, Options... > {
-            typedef Any type;
-        };
-
-        template <typename Any, typename... Options>
-        struct find_type_traits_option< Any, Options... > {
-            typedef typename find_type_traits_option< Options... >::type type;
-        };
-    } // namespace details
-    //@endcond
-
-    /// Metafunction to find opt::type_traits option in \p Options list
-    /** @headerfile cds/opt/options.h
-
-        If \p Options contains opt::type_traits option then it is the metafunction result.
-        Otherwise the result is \p DefaultOptons.
-    */
-    template <typename DefaultOptions, typename... Options>
-    struct find_type_traits {
-        typedef typename select_default< typename details::find_type_traits_option<Options...>::type, DefaultOptions>::type type ;  ///< Metafunction result
-    };
-
-
-    // *****************************************************************
-    // find_option metafunction
-    // *****************************************************************
-
-    //@cond
-    namespace details {
-        template <typename What, typename... Options>
-        struct find_option;
-
-        struct compare_ok;
-        struct compare_fail;
-
-        template <typename A, typename B>
-        struct compare_option
-        {
-            typedef compare_fail type;
-        };
-
-        template <template <typename> class Opt, typename A, typename B>
-        struct compare_option< Opt<A>, Opt<B> >
-        {
-            typedef compare_ok   type;
-        };
-
-        // Specializations for integral type of option
-#define CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_( _type ) template <template <_type> class What, _type A, _type B> \
-        struct compare_option< What<A>, What<B> > { typedef compare_ok type ; };
-
-        // For user-defined enum types
-#define CDS_DECLARE_FIND_OPTION_INTEGRAL_SPECIALIZATION( _type ) namespace cds { namespace opt { namespace details { CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(_type ) }}}
-
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(bool)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(char)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned char)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(signed char)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(short int)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned short int)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(int)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned int)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(long)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned long)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(long long)
-        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned long long)
-
-
-        template <typename CompResult, typename Ok, typename Fail>
-        struct select_option
-        {
-            typedef Fail    type;
-        };
-
-        template <typename Ok, typename Fail>
-        struct select_option< compare_ok, Ok, Fail >
-        {
-            typedef Ok      type;
-        };
-
-        template <typename What>
-        struct find_option< What > {
-            typedef What    type;
-        };
-
-        template <typename What, typename Opt>
-        struct find_option< What, Opt > {
-            typedef typename select_option<
-                typename compare_option< What, Opt >::type
-                ,Opt
-                ,What
-            >::type type;
-        };
-
-        template <typename What, typename Opt, typename... Options>
-        struct find_option< What, Opt, Options... > {
-            typedef typename select_option<
-                typename compare_option< What, Opt >::type
-                ,Opt
-                ,typename find_option< What, Options... >::type
-            >::type type;
-        };
-    } // namespace details
-    //@endcond
-
-    /// Metafunction to find \p What option in \p Options list
-    /** @headerfile cds/opt/options.h
-
-        If \p Options contains \p What< Val > option for any \p Val then the result is \p What< Val >
-        Otherwise the result is \p What.
-
-        Example:
-        \code
-        #include <cds/opt/options.h>
-        namespace co = cds::opt;
-
-        struct default_tag;
-        struct tag_a;
-        struct tag_b;
-
-        // Find option co::tag.
-
-        // res1 is co::tag< tag_a >
-        typedef co::find_option< co::tag< default_tag >, co::gc< cds::gc::HP >, co::tag< tag_a > >::type res1;
-
-        // res2 is default co::tag< default_tag >
-        typedef co::find_option< co::tag< default_tag >, co::less< x >, co::hash< H > >::type res2;
-
-        // Multiple option co::tag. The first option is selected
-        // res3 is default co::tag< tag_a >
-        typedef co::find_option< co::tag< default_tag >, co::tag< tag_a >, co::tag< tag_b > >::type res3;
-
-        \endcode
-    */
-    template <typename What, typename... Options>
-    struct find_option {
-        typedef typename details::find_option<What, Options...>::type   type ;  ///< Metafunction result
-    };
-
-
-    // *****************************************************************
-    // select metafunction
-    // *****************************************************************
-
-    //@cond
-    namespace details {
-
-        template <typename What, typename... Pairs>
-        struct select;
-
-        template <typename What, typename Value>
-        struct select< What, What, Value>
-        {
-            typedef Value   type;
-        };
-
-        template <typename What, typename Tag, typename Value>
-        struct select<What, Tag, Value>
-        {
-            typedef What    type;
-        };
-
-        template <typename What, typename Value, typename... Pairs>
-        struct select< What, What, Value, Pairs...>
-        {
-            typedef Value   type;
-        };
-
-        template <typename What, typename Tag, typename Value, typename... Pairs>
-        struct select< What, Tag, Value, Pairs...>
-        {
-            typedef typename select<What, Pairs...>::type   type;
-        };
-    }   // namespace details
-    //@endcond
-
-    /// Select option metafunction
-    /** @headerfile cds/opt/options.h
-
-        Pseudocode:
-        \code
-        select <What, T1, R1, T2, R2, ... Tn, Rn> ::=
-            if What == T1 then return R1
-            if What == T2 then return R2
-            ...
-            if What == Tn then return Rn
-            else return What
-        \endcode
-    */
-    template <typename What, typename... Pairs>
-    struct select {
-        typedef typename details::select< What, Pairs...>::type  type    ;   ///< Metafunction result
-    };
-
-}}  // namespace cds::opt
-
-#endif // #ifndef CDSLIB_OPT_MAKE_OPTIONS_STD_H
diff --git a/cds/opt/options.h b/cds/opt/options.h
index 2e52fa71..9fa817c2 100644
--- a/cds/opt/options.h
+++ b/cds/opt/options.h
@@ -864,6 +864,301 @@ namespace opt {
 
 }}  // namespace cds::opt
 
-#include <cds/opt/make_options_var.h>
+
+
+// ****************************************************
+// Options metafunctions
+
+namespace cds { namespace opt {
+
+    //@cond
+    namespace details {
+        template <typename OptionList, typename Option>
+        struct do_pack
+        {
+            // Use "pack" member template to pack options
+            typedef typename Option::template pack<OptionList> type;
+        };
+
+        template <typename ...T> class typelist;
+
+        template <typename Typelist> struct typelist_head;
+        template <typename Head, typename ...Tail>
+        struct typelist_head< typelist<Head, Tail...> > {
+            typedef Head type;
+        };
+        template <typename Head>
+        struct typelist_head< typelist<Head> > {
+            typedef Head type;
+        };
+
+        template <typename Typelist> struct typelist_tail;
+        template <typename Head, typename ...Tail>
+        struct typelist_tail< typelist<Head, Tail...> > {
+            typedef typelist<Tail...> type;
+        };
+        template <typename Head>
+        struct typelist_tail< typelist<Head> > {
+            typedef typelist<> type;
+        };
+
+        template <typename OptionList, typename Typelist>
+        struct make_options_impl {
+            typedef typename make_options_impl<
+                typename do_pack<
+                    OptionList,
+                    typename typelist_head< Typelist >::type
+                >::type,
+                typename typelist_tail<Typelist>::type
+            >::type type;
+        };
+
+        template <typename OptionList>
+        struct make_options_impl<OptionList, typelist<> > {
+            typedef OptionList type;
+        };
+    }   // namespace details
+    //@endcond
+
+    /// make_options metafunction
+    /** @headerfile cds/opt/options.h
+
+        The metafunction converts option list \p Options to traits structure.
+        The result of metafunction is \p type.
+
+        Template parameter \p OptionList is default option set (default traits).
+        \p Options is option list.
+    */
+    template <typename OptionList, typename... Options>
+    struct make_options {
+#ifdef CDS_DOXYGEN_INVOKED
+        typedef implementation_defined type ;   ///< Result of the metafunction
+#else
+        typedef typename details::make_options_impl< OptionList, details::typelist<Options...> >::type type;
+#endif
+    };
+
+
+    // *****************************************************************
+    // find_type_traits metafunction
+    // *****************************************************************
+
+    //@cond
+    namespace details {
+        template <typename... Options>
+        struct find_type_traits_option;
+
+        template <>
+        struct find_type_traits_option<> {
+            typedef cds::opt::none  type;
+        };
+
+        template <typename Any>
+        struct find_type_traits_option< Any > {
+            typedef cds::opt::none type;
+        };
+
+        template <typename Any>
+        struct find_type_traits_option< cds::opt::type_traits< Any > > {
+            typedef Any type;
+        };
+
+        template <typename Any, typename... Options>
+        struct find_type_traits_option< cds::opt::type_traits< Any >, Options... > {
+            typedef Any type;
+        };
+
+        template <typename Any, typename... Options>
+        struct find_type_traits_option< Any, Options... > {
+            typedef typename find_type_traits_option< Options... >::type type;
+        };
+    } // namespace details
+    //@endcond
+
+    /// Metafunction to find opt::type_traits option in \p Options list
+    /** @headerfile cds/opt/options.h
+
+        If \p Options contains opt::type_traits option then it is the metafunction result.
+        Otherwise the result is \p DefaultOptons.
+    */
+    template <typename DefaultOptions, typename... Options>
+    struct find_type_traits {
+        typedef typename select_default< typename details::find_type_traits_option<Options...>::type, DefaultOptions>::type type ;  ///< Metafunction result
+    };
+
+
+    // *****************************************************************
+    // find_option metafunction
+    // *****************************************************************
+
+    //@cond
+    namespace details {
+        template <typename What, typename... Options>
+        struct find_option;
+
+        struct compare_ok;
+        struct compare_fail;
+
+        template <typename A, typename B>
+        struct compare_option
+        {
+            typedef compare_fail type;
+        };
+
+        template <template <typename> class Opt, typename A, typename B>
+        struct compare_option< Opt<A>, Opt<B> >
+        {
+            typedef compare_ok   type;
+        };
+
+        // Specializations for integral type of option
+#define CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_( _type ) template <template <_type> class What, _type A, _type B> \
+        struct compare_option< What<A>, What<B> > { typedef compare_ok type ; };
+
+        // For user-defined enum types
+#define CDS_DECLARE_FIND_OPTION_INTEGRAL_SPECIALIZATION( _type ) namespace cds { namespace opt { namespace details { CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(_type ) }}}
+
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(bool)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(char)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned char)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(signed char)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(short int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned short int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(long)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned long)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(long long)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned long long)
+
+
+        template <typename CompResult, typename Ok, typename Fail>
+        struct select_option
+        {
+            typedef Fail    type;
+        };
+
+        template <typename Ok, typename Fail>
+        struct select_option< compare_ok, Ok, Fail >
+        {
+            typedef Ok      type;
+        };
+
+        template <typename What>
+        struct find_option< What > {
+            typedef What    type;
+        };
+
+        template <typename What, typename Opt>
+        struct find_option< What, Opt > {
+            typedef typename select_option<
+                typename compare_option< What, Opt >::type
+                ,Opt
+                ,What
+            >::type type;
+        };
+
+        template <typename What, typename Opt, typename... Options>
+        struct find_option< What, Opt, Options... > {
+            typedef typename select_option<
+                typename compare_option< What, Opt >::type
+                ,Opt
+                ,typename find_option< What, Options... >::type
+            >::type type;
+        };
+    } // namespace details
+    //@endcond
+
+    /// Metafunction to find \p What option in \p Options list
+    /** @headerfile cds/opt/options.h
+
+        If \p Options contains \p What< Val > option for any \p Val then the result is \p What< Val >
+        Otherwise the result is \p What.
+
+        Example:
+        \code
+        #include <cds/opt/options.h>
+        namespace co = cds::opt;
+
+        struct default_tag;
+        struct tag_a;
+        struct tag_b;
+
+        // Find option co::tag.
+
+        // res1 is co::tag< tag_a >
+        typedef co::find_option< co::tag< default_tag >, co::gc< cds::gc::HP >, co::tag< tag_a > >::type res1;
+
+        // res2 is default co::tag< default_tag >
+        typedef co::find_option< co::tag< default_tag >, co::less< x >, co::hash< H > >::type res2;
+
+        // Multiple option co::tag. The first option is selected
+        // res3 is default co::tag< tag_a >
+        typedef co::find_option< co::tag< default_tag >, co::tag< tag_a >, co::tag< tag_b > >::type res3;
+
+        \endcode
+    */
+    template <typename What, typename... Options>
+    struct find_option {
+        typedef typename details::find_option<What, Options...>::type   type ;  ///< Metafunction result
+    };
+
+
+    // *****************************************************************
+    // select metafunction
+    // *****************************************************************
+
+    //@cond
+    namespace details {
+
+        template <typename What, typename... Pairs>
+        struct select;
+
+        template <typename What, typename Value>
+        struct select< What, What, Value>
+        {
+            typedef Value   type;
+        };
+
+        template <typename What, typename Tag, typename Value>
+        struct select<What, Tag, Value>
+        {
+            typedef What    type;
+        };
+
+        template <typename What, typename Value, typename... Pairs>
+        struct select< What, What, Value, Pairs...>
+        {
+            typedef Value   type;
+        };
+
+        template <typename What, typename Tag, typename Value, typename... Pairs>
+        struct select< What, Tag, Value, Pairs...>
+        {
+            typedef typename select<What, Pairs...>::type   type;
+        };
+    }   // namespace details
+    //@endcond
+
+    /// Select option metafunction
+    /** @headerfile cds/opt/options.h
+
+        Pseudocode:
+        \code
+        select <What, T1, R1, T2, R2, ... Tn, Rn> ::=
+            if What == T1 then return R1
+            if What == T2 then return R2
+            ...
+            if What == Tn then return Rn
+            else return What
+        \endcode
+    */
+    template <typename What, typename... Pairs>
+    struct select {
+        typedef typename details::select< What, Pairs...>::type  type    ;   ///< Metafunction result
+    };
+
+}}  // namespace cds::opt
+
 
 #endif  // #ifndef CDSLIB_OPT_OPTIONS_H
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 245555c0..503c4965 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -921,7 +921,6 @@
     <ClInclude Include="..\..\..\cds\opt\buffer.h" />
     <ClInclude Include="..\..\..\cds\opt\compare.h" />
     <ClInclude Include="..\..\..\cds\opt\hash.h" />
-    <ClInclude Include="..\..\..\cds\opt\make_options_var.h" />
     <ClInclude Include="..\..\..\cds\opt\options.h" />
     <ClInclude Include="..\..\..\cds\opt\permutation.h" />
     <ClInclude Include="..\..\..\cds\opt\value_cleaner.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index fe212fb0..473a2fa6 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -452,9 +452,6 @@
     <ClInclude Include="..\..\..\cds\opt\hash.h">
       <Filter>Header Files\cds\opt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\opt\make_options_var.h">
-      <Filter>Header Files\cds\opt</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\opt\options.h">
       <Filter>Header Files\cds\opt</Filter>
     </ClInclude>
diff --git a/projects/Win/vc12/unit-map-insdel.vcxproj b/projects/Win/vc12/unit-map-insdel.vcxproj
index 0c087f56..9d9c05d1 100644
--- a/projects/Win/vc12/unit-map-insdel.vcxproj
+++ b/projects/Win/vc12/unit-map-insdel.vcxproj
@@ -57,7 +57,6 @@
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_cuckoo.cpp" />
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_ellentree.cpp" />
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_michael.cpp" />
-    <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_refinable.cpp" />
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_skip.cpp" />
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_split.cpp" />
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_striped.cpp" />
diff --git a/projects/Win/vc12/unit-map-insdel.vcxproj.filters b/projects/Win/vc12/unit-map-insdel.vcxproj.filters
index 8cfc1368..6b1098c0 100644
--- a/projects/Win/vc12/unit-map-insdel.vcxproj.filters
+++ b/projects/Win/vc12/unit-map-insdel.vcxproj.filters
@@ -43,9 +43,6 @@
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_michael.cpp">
       <Filter>map_insdel_int</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_refinable.cpp">
-      <Filter>map_insdel_int</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\tests\unit\map2\map_insdel_int_skip.cpp">
       <Filter>map_insdel_int</Filter>
     </ClCompile>
diff --git a/projects/source.unit.map.mk b/projects/source.unit.map.mk
index abbe9446..676f1e92 100644
--- a/projects/source.unit.map.mk
+++ b/projects/source.unit.map.mk
@@ -46,7 +46,6 @@ CDSUNIT_MAP_SOURCES := \
     tests/unit/map2/map_insdel_int_ellentree.cpp \
     tests/unit/map2/map_insdel_int_bronsonavltree.cpp \
     tests/unit/map2/map_insdel_int_striped.cpp \
-    tests/unit/map2/map_insdel_int_refinable.cpp \
     tests/unit/map2/map_insdel_int_cuckoo.cpp \
     tests/unit/map2/map_insdel_item_int.cpp \
     tests/unit/map2/map_insdel_item_int_michael.cpp \
diff --git a/tests/data/test-debug.conf b/tests/data/test-debug.conf
index df31370c..7a1650be 100644
--- a/tests/data/test-debug.conf
+++ b/tests/data/test-debug.conf
@@ -138,6 +138,11 @@ ThreadPassCount=8
 MapSize=50000
 MaxLoadFactor=4
 PrintGCStateFlag=1
+#Cuckoo map properties
+CuckooInitialSize=256
+CuckooProbesetSize=8
+# 0 - use default
+CuckooProbesetThreshold=0 
 
 [Map_InsDel_func]
 InsertThreadCount=4
diff --git a/tests/data/test-express.conf b/tests/data/test-express.conf
index 04965af4..08c51269 100644
--- a/tests/data/test-express.conf
+++ b/tests/data/test-express.conf
@@ -136,6 +136,11 @@ ThreadPassCount=2
 MapSize=100000
 MaxLoadFactor=4
 PrintGCStateFlag=1
+#Cuckoo map properties
+CuckooInitialSize=1024
+CuckooProbesetSize=16
+# 0 - use default
+CuckooProbesetThreshold=0 
 
 [Map_InsDel_func]
 InsertThreadCount=4
diff --git a/tests/data/test.conf b/tests/data/test.conf
index 62327b6a..f6663b31 100644
--- a/tests/data/test.conf
+++ b/tests/data/test.conf
@@ -131,6 +131,11 @@ ThreadPassCount=2
 MapSize=1000000
 MaxLoadFactor=4
 PrintGCStateFlag=1
+#Cuckoo map properties
+CuckooInitialSize=1024
+CuckooProbesetSize=16
+# 0 - use default
+CuckooProbesetThreshold=0 
 
 [Map_InsDel_func]
 InsertThreadCount=4
diff --git a/tests/unit/map2/CMakeLists.txt b/tests/unit/map2/CMakeLists.txt
index 9cd5700c..88996ec2 100644
--- a/tests/unit/map2/CMakeLists.txt
+++ b/tests/unit/map2/CMakeLists.txt
@@ -47,7 +47,6 @@ set(CDSUNIT_MAP_SOURCES
     map_insdel_int_ellentree.cpp
     map_insdel_int_bronsonavltree.cpp
     map_insdel_int_striped.cpp
-    map_insdel_int_refinable.cpp
     map_insdel_int_cuckoo.cpp
     map_insdel_item_int.cpp
     map_insdel_item_int_michael.cpp
diff --git a/tests/unit/map2/map_defs.h b/tests/unit/map2/map_defs.h
index 96c93787..6a07e050 100644
--- a/tests/unit/map2/map_defs.h
+++ b/tests/unit/map2/map_defs.h
@@ -561,16 +561,10 @@
 // StripedMap
 
 #define CDSUNIT_DECLARE_StripedMap_common \
-    CDSUNIT_DECLARE_TEST(StripedMap_list) \
-    CDSUNIT_DECLARE_TEST(StripedMap_map) \
-    CDSUNIT_DECLARE_TEST(StripedMap_hashmap) \
-    CDSUNIT_DECLARE_TEST(StripedMap_boost_unordered_map)
-
-#define CDSUNIT_DEFINE_StripedMap_common( IMPL, C ) \
-    TEST_MAP(IMPL, C, StripedMap_list) \
-    TEST_MAP(IMPL, C, StripedMap_map) \
-    TEST_MAP(IMPL, C, StripedMap_hashmap) \
-    TEST_MAP(IMPL, C, StripedMap_boost_unordered_map)
+    TEST_CASE(tag_StripedMap, StripedMap_list) \
+    TEST_CASE(tag_StripedMap, StripedMap_map) \
+    TEST_CASE(tag_StripedMap, StripedMap_hashmap) \
+    TEST_CASE(tag_StripedMap, StripedMap_boost_unordered_map)
 
 #define CDSUNIT_TEST_StripedMap_common \
     CPPUNIT_TEST(StripedMap_list) \
@@ -580,33 +574,27 @@
 
 #if BOOST_VERSION >= 104800
 #   define CDSUNIT_DECLARE_StripedMap_boost_container \
-        CDSUNIT_DECLARE_TEST(StripedMap_boost_list) \
-        CDSUNIT_DECLARE_TEST(StripedMap_slist) \
-        CDSUNIT_DECLARE_TEST(StripedMap_boost_map)
-#   define CDSUNIT_DEFINE_StripedMap_boost_container( IMPL, C ) \
-        TEST_MAP(IMPL, C, StripedMap_boost_list) \
-        TEST_MAP(IMPL, C, StripedMap_slist) \
-        TEST_MAP(IMPL, C, StripedMap_boost_map)
+        TEST_CASE(tag_StripedMap, StripedMap_boost_list) \
+        TEST_CASE(tag_StripedMap, StripedMap_slist) \
+        TEST_CASE(tag_StripedMap, StripedMap_boost_map)
+
 #   define CDSUNIT_TEST_StripedMap_boost_container \
         CPPUNIT_TEST(StripedMap_boost_list) \
         CPPUNIT_TEST(StripedMap_slist) \
         CPPUNIT_TEST(StripedMap_boost_map)
 #else
 #   define CDSUNIT_DECLARE_StripedMap_boost_container
-#   define CDSUNIT_DEFINE_StripedMap_boost_container( IMPL, C )
 #   define CDSUNIT_TEST_StripedMap_boost_container
 #endif
 
 #if BOOST_VERSION >= 104800 && defined(CDS_UNIT_MAP_TYPES_ENABLE_BOOST_FLAT_CONTAINERS)
 #   define CDSUNIT_DECLARE_StripedMap_boost_flat_container \
-        CDSUNIT_DECLARE_TEST(StripedMap_boost_flat_map)
-#   define CDSUNIT_DEFINE_StripedMap_boost_flat_container( IMPL, C ) \
-        TEST_MAP(IMPL, C, StripedMap_boost_flat_map)
+        TEST_CASE(tag_StripedMap, StripedMap_boost_flat_map)
+
 #   define CDSUNIT_TEST_StripedMap_boost_flat_container \
         CPPUNIT_TEST(StripedMap_boost_flat_map)
 #else
 #   define CDSUNIT_DECLARE_StripedMap_boost_flat_container
-#   define CDSUNIT_DEFINE_StripedMap_boost_flat_container( IMPL, C )
 #   define CDSUNIT_TEST_StripedMap_boost_flat_container
 #endif
 
@@ -614,10 +602,7 @@
     CDSUNIT_DECLARE_StripedMap_common \
     CDSUNIT_DECLARE_StripedMap_boost_container \
     CDSUNIT_DECLARE_StripedMap_boost_flat_container
-#define CDSUNIT_DEFINE_StripedMap( IMPL, C ) \
-    CDSUNIT_DEFINE_StripedMap_common( IMPL, C ) \
-    CDSUNIT_DEFINE_StripedMap_boost_container( IMPL, C ) \
-    CDSUNIT_DEFINE_StripedMap_boost_flat_container( IMPL, C )
+
 #define CDSUNIT_TEST_StripedMap \
     CDSUNIT_TEST_StripedMap_common \
     CDSUNIT_TEST_StripedMap_boost_container \
@@ -628,15 +613,11 @@
 // RefinableMap
 
 #define CDSUNIT_DECLARE_RefinableMap_common \
-    CDSUNIT_DECLARE_TEST(RefinableMap_list) \
-    CDSUNIT_DECLARE_TEST(RefinableMap_map) \
-    CDSUNIT_DECLARE_TEST(RefinableMap_hashmap) \
-    CDSUNIT_DECLARE_TEST(RefinableMap_boost_unordered_map)
-#define CDSUNIT_DEFINE_RefinableMap_common( IMPL, C ) \
-    TEST_MAP(IMPL, C, RefinableMap_list) \
-    TEST_MAP(IMPL, C, RefinableMap_map) \
-    TEST_MAP(IMPL, C, RefinableMap_hashmap) \
-    TEST_MAP(IMPL, C, RefinableMap_boost_unordered_map)
+    TEST_CASE(tag_StripedMap, RefinableMap_list) \
+    TEST_CASE(tag_StripedMap, RefinableMap_map) \
+    TEST_CASE(tag_StripedMap, RefinableMap_hashmap) \
+    TEST_CASE(tag_StripedMap, RefinableMap_boost_unordered_map)
+
 #define CDSUNIT_TEST_RefinableMap_common \
     CPPUNIT_TEST(RefinableMap_list) \
     CPPUNIT_TEST(RefinableMap_map) \
@@ -645,33 +626,27 @@
 
 #if BOOST_VERSION >= 104800
 #   define CDSUNIT_DECLARE_RefinableMap_boost_container \
-        CDSUNIT_DECLARE_TEST(RefinableMap_boost_list) \
-        CDSUNIT_DECLARE_TEST(RefinableMap_slist) \
-        CDSUNIT_DECLARE_TEST(RefinableMap_boost_map)
-#   define CDSUNIT_DEFINE_RefinableMap_boost_container( IMPL, C ) \
-        TEST_MAP(IMPL, C, RefinableMap_boost_list) \
-        TEST_MAP(IMPL, C, RefinableMap_slist) \
-        TEST_MAP(IMPL, C, RefinableMap_boost_map)
+        TEST_CASE(tag_StripedMap, RefinableMap_boost_list) \
+        TEST_CASE(tag_StripedMap, RefinableMap_slist) \
+        TEST_CASE(tag_StripedMap, RefinableMap_boost_map)
+
 #   define CDSUNIT_TEST_RefinableMap_boost_container \
         CPPUNIT_TEST(RefinableMap_boost_list) \
         CPPUNIT_TEST(RefinableMap_slist) \
         CPPUNIT_TEST(RefinableMap_boost_map)
 #else
 #   define CDSUNIT_DECLARE_RefinableMap_boost_container
-#   define CDSUNIT_DEFINE_RefinableMap_boost_container( IMPL, C )
 #   define CDSUNIT_TEST_RefinableMap_boost_container
 #endif
 
 #if BOOST_VERSION >= 104800 && defined(CDS_UNIT_MAP_TYPES_ENABLE_BOOST_FLAT_CONTAINERS)
 #   define CDSUNIT_DECLARE_RefinableMap_boost_flat_container \
-        CDSUNIT_DECLARE_TEST(RefinableMap_boost_flat_map)
-#   define CDSUNIT_DEFINE_RefinableMap_boost_flat_container( IMPL, C ) \
-        TEST_MAP( IMPL, C, RefinableMap_boost_flat_map)
+        TEST_CASE(tag_StripedMap, RefinableMap_boost_flat_map)
+
 #   define CDSUNIT_TEST_RefinableMap_boost_flat_container \
         CPPUNIT_TEST(RefinableMap_boost_flat_map)
 #else
 #   define CDSUNIT_DECLARE_RefinableMap_boost_flat_container
-#   define CDSUNIT_DEFINE_RefinableMap_boost_flat_container( IMPL, C )
 #   define CDSUNIT_TEST_RefinableMap_boost_flat_container
 #endif
 
@@ -679,10 +654,7 @@
     CDSUNIT_DECLARE_RefinableMap_common \
     CDSUNIT_DECLARE_RefinableMap_boost_container \
     CDSUNIT_DECLARE_RefinableMap_boost_flat_container
-#define CDSUNIT_DEFINE_RefinableMap( IMPL, C ) \
-    CDSUNIT_DEFINE_RefinableMap_common( IMPL, C ) \
-    CDSUNIT_DEFINE_RefinableMap_boost_container( IMPL, C ) \
-    CDSUNIT_DEFINE_RefinableMap_boost_flat_container( IMPL, C )
+
 #define CDSUNIT_TEST_RefinableMap \
     CDSUNIT_TEST_RefinableMap_common \
     CDSUNIT_TEST_RefinableMap_boost_container \
diff --git a/tests/unit/map2/map_delodd.h b/tests/unit/map2/map_delodd.h
index 61908482..3121deed 100644
--- a/tests/unit/map2/map_delodd.h
+++ b/tests/unit/map2/map_delodd.h
@@ -716,6 +716,7 @@ namespace map2 {
             //CDSUNIT_TEST_MultiLevelHashMap // the test is not suitable
         CPPUNIT_TEST_SUITE_END();
 
+        // Not implemented yet
         ////CDSUNIT_DECLARE_StripedMap
         ////CDSUNIT_DECLARE_RefinableMap
         ////CDSUNIT_DECLARE_StdMap
diff --git a/tests/unit/map2/map_insdel_int.cpp b/tests/unit/map2/map_insdel_int.cpp
index 42e053cf..f824161e 100644
--- a/tests/unit/map2/map_insdel_int.cpp
+++ b/tests/unit/map2/map_insdel_int.cpp
@@ -1,17 +1,11 @@
 //$$CDS-header$$
 
 #include "map2/map_insdel_int.h"
+#include <cds/os/topology.h>
 
 namespace map2 {
     CPPUNIT_TEST_SUITE_REGISTRATION( Map_InsDel_int );
 
-    size_t Map_InsDel_int::c_nMapSize = 1000000;
-    size_t Map_InsDel_int::c_nInsertThreadCount = 4;
-    size_t Map_InsDel_int::c_nDeleteThreadCount = 4;
-    size_t Map_InsDel_int::c_nThreadPassCount = 4;
-    size_t Map_InsDel_int::c_nMaxLoadFactor = 8;
-    bool   Map_InsDel_int::c_bPrintGCState = true;
-
 
     void Map_InsDel_int::setUpParams( const CppUnitMini::TestCfg& cfg ) {
         c_nInsertThreadCount = cfg.getSizeT("InsertThreadCount", c_nInsertThreadCount );
@@ -19,22 +13,23 @@ namespace map2 {
         c_nThreadPassCount = cfg.getSizeT("ThreadPassCount", c_nThreadPassCount );
         c_nMapSize = cfg.getSizeT("MapSize", c_nMapSize );
         c_nMaxLoadFactor = cfg.getSizeT("MaxLoadFactor", c_nMaxLoadFactor );
-        c_bPrintGCState = cfg.getBool("PrintGCStateFlag", c_bPrintGCState );
-    }
 
-    void Map_InsDel_int::myRun(const char *in_name, bool invert /*= false*/)
-    {
-        setUpParams( m_Cfg.get( "Map_InsDel_int" ));
+        c_nCuckooInitialSize = cfg.getULong("CuckooInitialSize", static_cast<unsigned long>(c_nCuckooInitialSize) );
+        c_nCuckooProbesetSize = cfg.getULong("CuckooProbesetSize", static_cast<unsigned long>(c_nCuckooProbesetSize) );
+        c_nCuckooProbesetThreshold = cfg.getULong("CuckooProbesetThreshold", static_cast<unsigned long>(c_nCuckooProbesetThreshold) );
 
-        run_MichaelMap(in_name, invert);
-        run_SplitList(in_name, invert);
-        run_SkipListMap(in_name, invert);
-        run_EllenBinTreeMap(in_name, invert);
-        run_BronsonAVLTreeMap(in_name, invert);
-        run_StripedMap(in_name, invert);
-        run_RefinableMap(in_name, invert);
-        run_CuckooMap(in_name, invert);
+        c_bPrintGCState = cfg.getBool("PrintGCStateFlag", c_bPrintGCState );
+
+        if ( c_nInsertThreadCount == 0 )
+            c_nInsertThreadCount = cds::OS::topology::processor_count();
+        if ( c_nDeleteThreadCount == 0 )
+            c_nDeleteThreadCount = cds::OS::topology::processor_count();
 
-        endTestCase();
+        m_arrValues.clear();
+        m_arrValues.reserve( c_nMapSize );
+        for ( size_t i = 0; i < c_nMapSize; ++i )
+            m_arrValues.push_back( i );
+        shuffle( m_arrValues.begin(), m_arrValues.end() );
     }
+
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int.h b/tests/unit/map2/map_insdel_int.h
index 757a7acf..66cd8830 100644
--- a/tests/unit/map2/map_insdel_int.h
+++ b/tests/unit/map2/map_insdel_int.h
@@ -7,20 +7,25 @@
 
 namespace map2 {
 
-#   define TEST_MAP(IMPL, C, X)         void C::X() { test<map_type<IMPL, key_type, value_type>::X >(); }
-#   define TEST_MAP_EXTRACT(IMPL, C, X) TEST_MAP(IMPL, C, X)
-#   define TEST_MAP_NOLF(IMPL, C, X)    void C::X() { test_nolf<map_type<IMPL, key_type, value_type>::X >(); }
-#   define TEST_MAP_NOLF_EXTRACT(IMPL, C, X) TEST_MAP_NOLF(IMPL, C, X)
+#   define TEST_CASE(TAG, X)  void X();
 
     class Map_InsDel_int: public CppUnitMini::TestCase
     {
-        static size_t  c_nMapSize;            // map size
-        static size_t  c_nInsertThreadCount;  // count of insertion thread
-        static size_t  c_nDeleteThreadCount;  // count of deletion thread
-        static size_t  c_nThreadPassCount;    // pass count for each thread
-        static size_t  c_nMaxLoadFactor;      // maximum load factor
-        static bool    c_bPrintGCState;
+    public:
+        size_t c_nMapSize = 1000000;      // map size
+        size_t c_nInsertThreadCount = 4;  // count of insertion thread
+        size_t c_nDeleteThreadCount = 4;  // count of deletion thread
+        size_t c_nThreadPassCount = 4;    // pass count for each thread
+        size_t c_nMaxLoadFactor = 8;      // maximum load factor
+        size_t  c_nCuckooInitialSize = 1024;// initial size for CuckooMap
+        size_t  c_nCuckooProbesetSize = 16; // CuckooMap probeset size (only for list-based probeset)
+        size_t  c_nCuckooProbesetThreshold = 0; // CUckooMap probeset threshold (o - use default)
 
+        bool   c_bPrintGCState = true;
+
+        size_t  c_nLoadFactor;  // current load factor
+
+    private:
         typedef CppUnitMini::TestCase Base;
         typedef size_t  key_type;
         typedef size_t  value_type;
@@ -28,10 +33,10 @@ namespace map2 {
         typedef std::vector<key_type>   key_array;
         key_array                       m_arrValues;
 
-        template <class MAP>
+        template <class Map>
         class Inserter: public CppUnitMini::TestThread
         {
-            MAP&     m_Map;
+            Map&     m_Map;
 
             virtual Inserter *    clone()
             {
@@ -42,7 +47,7 @@ namespace map2 {
             size_t  m_nInsertFailed;
 
         public:
-            Inserter( CppUnitMini::ThreadPool& pool, MAP& rMap )
+            Inserter( CppUnitMini::ThreadPool& pool, Map& rMap )
                 : CppUnitMini::TestThread( pool )
                 , m_Map( rMap )
             {}
@@ -61,14 +66,16 @@ namespace map2 {
 
             virtual void test()
             {
-                MAP& rMap = m_Map;
+                Map& rMap = m_Map;
 
                 m_nInsertSuccess =
                     m_nInsertFailed = 0;
                 key_array const& arr = getTest().m_arrValues;
 
+                size_t const nPassCount = getTest().c_nThreadPassCount;
+
                 if ( m_nThreadNo & 1 ) {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
+                    for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) {
                         for ( key_array::const_iterator it = arr.begin(), itEnd = arr.end(); it != itEnd; ++it ) {
                             if ( rMap.insert( *it, *it * 8 ) )
                                 ++m_nInsertSuccess;
@@ -78,7 +85,7 @@ namespace map2 {
                     }
                 }
                 else {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
+                    for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) {
                         for ( key_array::const_reverse_iterator it = arr.rbegin(), itEnd = arr.rend(); it != itEnd; ++it ) {
                             if ( rMap.insert( *it, *it * 8 ) )
                                 ++m_nInsertSuccess;
@@ -90,10 +97,10 @@ namespace map2 {
             }
         };
 
-        template <class MAP>
+        template <class Map>
         class Deleter: public CppUnitMini::TestThread
         {
-            MAP&     m_Map;
+            Map&     m_Map;
 
             virtual Deleter *    clone()
             {
@@ -104,7 +111,7 @@ namespace map2 {
             size_t  m_nDeleteFailed;
 
         public:
-            Deleter( CppUnitMini::ThreadPool& pool, MAP& rMap )
+            Deleter( CppUnitMini::ThreadPool& pool, Map& rMap )
                 : CppUnitMini::TestThread( pool )
                 , m_Map( rMap )
             {}
@@ -123,14 +130,16 @@ namespace map2 {
 
             virtual void test()
             {
-                MAP& rMap = m_Map;
+                Map& rMap = m_Map;
 
                 m_nDeleteSuccess =
                     m_nDeleteFailed = 0;
                 key_array const& arr = getTest().m_arrValues;
 
+                size_t const nPassCount = getTest().c_nThreadPassCount;
+
                 if ( m_nThreadNo & 1 ) {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
+                    for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) {
                         for ( key_array::const_iterator it = arr.begin(), itEnd = arr.end(); it != itEnd; ++it ) {
                             if ( rMap.erase( *it ) )
                                 ++m_nDeleteSuccess;
@@ -140,7 +149,7 @@ namespace map2 {
                     }
                 }
                 else {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
+                    for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) {
                         for ( key_array::const_reverse_iterator it = arr.rbegin(), itEnd = arr.rend(); it != itEnd; ++it ) {
                             if ( rMap.erase( *it ) )
                                 ++m_nDeleteSuccess;
@@ -153,19 +162,13 @@ namespace map2 {
         };
 
     protected:
-        template <class MAP>
-        void do_test( MAP& testMap )
+        template <class Map>
+        void do_test( Map& testMap )
         {
-            typedef Inserter<MAP>       InserterThread;
-            typedef Deleter<MAP>        DeleterThread;
+            typedef Inserter<Map>       InserterThread;
+            typedef Deleter<Map>        DeleterThread;
             cds::OS::Timer    timer;
 
-            m_arrValues.clear();
-            m_arrValues.reserve( c_nMapSize );
-            for ( size_t i = 0; i < c_nMapSize; ++i )
-                m_arrValues.push_back( i );
-            shuffle( m_arrValues.begin(), m_arrValues.end() );
-
             CppUnitMini::ThreadPool pool( *this );
             pool.add( new InserterThread( pool, testMap ), c_nInsertThreadCount );
             pool.add( new DeleterThread( pool, testMap ), c_nDeleteThreadCount );
@@ -211,8 +214,8 @@ namespace map2 {
             additional_cleanup( testMap );
         }
 
-        template <class MAP>
-        void test()
+        template <class Map>
+        void run_test()
         {
             CPPUNIT_MSG( "Thread count: insert=" << c_nInsertThreadCount
                 << " delete=" << c_nDeleteThreadCount
@@ -220,44 +223,25 @@ namespace map2 {
                 << " map size=" << c_nMapSize
                 );
 
-            for ( size_t nLoadFactor = 1; nLoadFactor <= c_nMaxLoadFactor; nLoadFactor *= 2 ) {
-                CPPUNIT_MSG( "Load factor=" << nLoadFactor );
-                MAP  testMap( c_nMapSize, nLoadFactor );
+            if ( Map::c_bLoadFactorDepended ) {
+                for ( c_nLoadFactor = 1; c_nLoadFactor <= c_nMaxLoadFactor; c_nLoadFactor *= 2 ) {
+                    CPPUNIT_MSG( "Load factor=" << c_nLoadFactor );
+                    Map  testMap( *this );
+                    do_test( testMap );
+                    if ( c_bPrintGCState )
+                        print_gc_state();
+                }
+            }
+            else {
+                Map testMap( *this );
                 do_test( testMap );
                 if ( c_bPrintGCState )
                     print_gc_state();
             }
         }
 
-        template <class MAP>
-        void test_nolf()
-        {
-            CPPUNIT_MSG( "Thread count: insert=" << c_nInsertThreadCount
-                << " delete=" << c_nDeleteThreadCount
-                << " pass count=" << c_nThreadPassCount
-                << " map size=" << c_nMapSize
-                );
-
-            MAP testMap;
-            do_test( testMap );
-            if ( c_bPrintGCState )
-                print_gc_state();
-        }
-
         void setUpParams( const CppUnitMini::TestCfg& cfg );
 
-        void run_MichaelMap(const char *in_name, bool invert = false);
-        void run_SplitList(const char *in_name, bool invert = false);
-        void run_StripedMap(const char *in_name, bool invert = false);
-        void run_RefinableMap(const char *in_name, bool invert = false);
-        void run_CuckooMap(const char *in_name, bool invert = false);
-        void run_SkipListMap(const char *in_name, bool invert = false);
-        void run_EllenBinTreeMap(const char *in_name, bool invert = false);
-        void run_BronsonAVLTreeMap(const char *in_name, bool invert = false);
-
-        virtual void myRun(const char *in_name, bool invert = false);
-
-
 #   include "map2/map_defs.h"
         CDSUNIT_DECLARE_MichaelMap
         CDSUNIT_DECLARE_SplitList
@@ -268,5 +252,20 @@ namespace map2 {
         CDSUNIT_DECLARE_RefinableMap
         CDSUNIT_DECLARE_CuckooMap
         //CDSUNIT_DECLARE_StdMap
+
+        CPPUNIT_TEST_SUITE(Map_InsDel_int)
+            CDSUNIT_TEST_MichaelMap
+            CDSUNIT_TEST_SplitList
+            CDSUNIT_TEST_SkipListMap
+            CDSUNIT_TEST_EllenBinTreeMap
+            CDSUNIT_TEST_BronsonAVLTreeMap
+            CDSUNIT_TEST_CuckooMap
+            CDSUNIT_TEST_StripedMap
+            CDSUNIT_TEST_RefinableMap
+            //CDSUNIT_TEST_StdMap
+
+            //CDSUNIT_TEST_MultiLevelHashMap // the test is not suitable
+        CPPUNIT_TEST_SUITE_END();
+
     };
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_bronsonavltree.cpp b/tests/unit/map2/map_insdel_int_bronsonavltree.cpp
index 520be6c2..efc46c84 100644
--- a/tests/unit/map2/map_insdel_int_bronsonavltree.cpp
+++ b/tests/unit/map2/map_insdel_int_bronsonavltree.cpp
@@ -3,10 +3,10 @@
 #include "map2/map_insdel_int.h"
 #include "map2/map_type_bronson_avltree.h"
 
-namespace map2 {
-    CDSUNIT_DEFINE_BronsonAVLTreeMap( cc::bronson_avltree::implementation_tag, Map_InsDel_int)
+#undef TEST_CASE
+#define TEST_CASE(TAG, X)  void Map_InsDel_int::X() { run_test<typename map_type< TAG, key_type, value_type>::X>(); }
+#include "map2/map_defs.h"
 
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_BronsonAVLTreeMap )
-        CDSUNIT_TEST_BronsonAVLTreeMap
-    CPPUNIT_TEST_SUITE_END_PART()
+namespace map2 {
+    CDSUNIT_DECLARE_BronsonAVLTreeMap
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_cuckoo.cpp b/tests/unit/map2/map_insdel_int_cuckoo.cpp
index b9e399dc..b701d0a0 100644
--- a/tests/unit/map2/map_insdel_int_cuckoo.cpp
+++ b/tests/unit/map2/map_insdel_int_cuckoo.cpp
@@ -3,10 +3,10 @@
 #include "map2/map_insdel_int.h"
 #include "map2/map_type_cuckoo.h"
 
-namespace map2 {
-    CDSUNIT_DEFINE_CuckooMap(cds::intrusive::cuckoo::implementation_tag, Map_InsDel_int)
+#undef TEST_CASE
+#define TEST_CASE(TAG, X)  void Map_InsDel_int::X() { run_test<typename map_type< TAG, key_type, value_type>::X>(); }
+#include "map2/map_defs.h"
 
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_CuckooMap )
-        CDSUNIT_TEST_CuckooMap
-    CPPUNIT_TEST_SUITE_END_PART()
+namespace map2 {
+    CDSUNIT_DECLARE_CuckooMap
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_ellentree.cpp b/tests/unit/map2/map_insdel_int_ellentree.cpp
index 3288eb5a..918a6508 100644
--- a/tests/unit/map2/map_insdel_int_ellentree.cpp
+++ b/tests/unit/map2/map_insdel_int_ellentree.cpp
@@ -3,10 +3,10 @@
 #include "map2/map_insdel_int.h"
 #include "map2/map_type_ellen_bintree.h"
 
-namespace map2 {
-    CDSUNIT_DEFINE_EllenBinTreeMap( cc::ellen_bintree::implementation_tag, Map_InsDel_int)
+#undef TEST_CASE
+#define TEST_CASE(TAG, X)  void Map_InsDel_int::X() { run_test<typename map_type< TAG, key_type, value_type>::X>(); }
+#include "map2/map_defs.h"
 
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_EllenBinTreeMap )
-        CDSUNIT_TEST_EllenBinTreeMap
-    CPPUNIT_TEST_SUITE_END_PART()
+namespace map2 {
+    CDSUNIT_DECLARE_EllenBinTreeMap
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_michael.cpp b/tests/unit/map2/map_insdel_int_michael.cpp
index 45f54824..609c2c31 100644
--- a/tests/unit/map2/map_insdel_int_michael.cpp
+++ b/tests/unit/map2/map_insdel_int_michael.cpp
@@ -3,10 +3,10 @@
 #include "map2/map_insdel_int.h"
 #include "map2/map_type_michael.h"
 
-namespace map2 {
-    CDSUNIT_DEFINE_MichaelMap( cc::michael_map::implementation_tag, Map_InsDel_int )
+#undef TEST_CASE
+#define TEST_CASE(TAG, X)  void Map_InsDel_int::X() { run_test<typename map_type< TAG, key_type, value_type>::X>(); }
+#include "map2/map_defs.h"
 
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_MichaelMap )
-        CDSUNIT_TEST_MichaelMap
-    CPPUNIT_TEST_SUITE_END_PART()
+namespace map2 {
+    CDSUNIT_DECLARE_MichaelMap
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_refinable.cpp b/tests/unit/map2/map_insdel_int_refinable.cpp
deleted file mode 100644
index 78c490f3..00000000
--- a/tests/unit/map2/map_insdel_int_refinable.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-//$$CDS-header$$
-
-#include "map2/map_insdel_int.h"
-#include "map2/map_type_striped.h"
-
-namespace map2 {
-    CDSUNIT_DEFINE_RefinableMap(cc::striped_set::implementation_tag, Map_InsDel_int)
-
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_RefinableMap )
-        CDSUNIT_TEST_RefinableMap
-    CPPUNIT_TEST_SUITE_END_PART()
-} // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_skip.cpp b/tests/unit/map2/map_insdel_int_skip.cpp
index 7c5e6d90..2df1050c 100644
--- a/tests/unit/map2/map_insdel_int_skip.cpp
+++ b/tests/unit/map2/map_insdel_int_skip.cpp
@@ -3,10 +3,10 @@
 #include "map2/map_insdel_int.h"
 #include "map2/map_type_skip_list.h"
 
-namespace map2 {
-    CDSUNIT_DEFINE_SkipListMap( cc::skip_list::implementation_tag, Map_InsDel_int)
+#undef TEST_CASE
+#define TEST_CASE(TAG, X)  void Map_InsDel_int::X() { run_test<typename map_type< TAG, key_type, value_type>::X>(); }
+#include "map2/map_defs.h"
 
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_SkipListMap )
-        CDSUNIT_TEST_SkipListMap
-    CPPUNIT_TEST_SUITE_END_PART()
+namespace map2 {
+    CDSUNIT_DECLARE_SkipListMap
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_split.cpp b/tests/unit/map2/map_insdel_int_split.cpp
index 1c8e3e20..59a0ad09 100644
--- a/tests/unit/map2/map_insdel_int_split.cpp
+++ b/tests/unit/map2/map_insdel_int_split.cpp
@@ -3,10 +3,10 @@
 #include "map2/map_insdel_int.h"
 #include "map2/map_type_split_list.h"
 
-namespace map2 {
-    CDSUNIT_DEFINE_SplitList( cc::split_list::implementation_tag, Map_InsDel_int )
+#undef TEST_CASE
+#define TEST_CASE(TAG, X)  void Map_InsDel_int::X() { run_test<typename map_type< TAG, key_type, value_type>::X>(); }
+#include "map2/map_defs.h"
 
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_SplitList )
-        CDSUNIT_TEST_SplitList
-    CPPUNIT_TEST_SUITE_END_PART()
+namespace map2 {
+    CDSUNIT_DECLARE_SplitList
 } // namespace map2
diff --git a/tests/unit/map2/map_insdel_int_striped.cpp b/tests/unit/map2/map_insdel_int_striped.cpp
index 4bcb09bc..da61c530 100644
--- a/tests/unit/map2/map_insdel_int_striped.cpp
+++ b/tests/unit/map2/map_insdel_int_striped.cpp
@@ -3,10 +3,11 @@
 #include "map2/map_insdel_int.h"
 #include "map2/map_type_striped.h"
 
-namespace map2 {
-    CDSUNIT_DEFINE_StripedMap(cc::striped_set::implementation_tag, Map_InsDel_int)
+#undef TEST_CASE
+#define TEST_CASE(TAG, X)  void Map_InsDel_int::X() { run_test<typename map_type< TAG, key_type, value_type>::X>(); }
+#include "map2/map_defs.h"
 
-    CPPUNIT_TEST_SUITE_PART( Map_InsDel_int, run_StripedMap )
-        CDSUNIT_TEST_StripedMap
-    CPPUNIT_TEST_SUITE_END_PART()
+namespace map2 {
+    CDSUNIT_DECLARE_StripedMap
+    CDSUNIT_DECLARE_RefinableMap
 } // namespace map2
diff --git a/tests/unit/map2/map_type_striped.h b/tests/unit/map2/map_type_striped.h
index a1e5a1e8..07229cec 100644
--- a/tests/unit/map2/map_type_striped.h
+++ b/tests/unit/map2/map_type_striped.h
@@ -20,8 +20,10 @@
 
 namespace map2 {
 
+    struct tag_StripedMap;
+
     template <typename Key, typename Value>
-    struct map_type< cc::striped_set::implementation_tag, Key, Value >: public map_type_base< Key, Value >
+    struct map_type< tag_StripedMap, Key, Value >: public map_type_base< Key, Value >
     {
         typedef map_type_base< Key, Value > base_class;
         typedef typename base_class::compare    compare;
@@ -49,9 +51,14 @@ namespace map2 {
 
             resizing_policy_t   m_placeHolder;
         public:
-            StripedHashMap_seq( size_t nCapacity, size_t nLoadFactor )
-                : base_class( nCapacity / nLoadFactor / 16, *(new(&m_placeHolder) resizing_policy_t( nLoadFactor )) )
+            template <class Config>
+            StripedHashMap_seq( Config const& cfg )
+                : base_class( cfg.c_nMapSize / cfg.c_nLoadFactor / 16, *(new(&m_placeHolder) resizing_policy_t( cfg.c_nLoadFactor )) )
             {}
+
+            // for testing
+            static CDS_CONSTEXPR bool const c_bExtractSupported = false;
+            static CDS_CONSTEXPR bool const c_bLoadFactorDepended = true;
         };
 
         // for non-sequential ordered containers
@@ -72,9 +79,14 @@ namespace map2 {
 
             resizing_policy_t   m_placeHolder;
         public:
-            StripedHashMap_ord( size_t /*nCapacity*/, size_t nLoadFactor )
-                : base_class( 0, *(new(&m_placeHolder) resizing_policy_t( nLoadFactor * 1024 )) )
+            template <class Config>
+            StripedHashMap_ord( Config const& cfg )
+                : base_class( 0, *(new(&m_placeHolder) resizing_policy_t( cfg.c_nMaxLoadFactor * 1024 )) )
             {}
+
+            // for testing
+            static CDS_CONSTEXPR bool const c_bExtractSupported = false;
+            static CDS_CONSTEXPR bool const c_bLoadFactorDepended = false;
         };
 
 
@@ -152,9 +164,14 @@ namespace map2 {
 
             resizing_policy_t   m_placeHolder;
         public:
-            RefinableHashMap_seq( size_t nCapacity, size_t nLoadFactor )
-                : base_class( nCapacity / nLoadFactor / 16, *(new(&m_placeHolder) resizing_policy_t( nLoadFactor )) )
+            template <class Config>
+            RefinableHashMap_seq( Config const& cfg )
+                : base_class( cfg.c_nMapSize / cfg.c_nLoadFactor / 16, *(new(&m_placeHolder) resizing_policy_t( cfg.c_nLoadFactor )))
             {}
+
+            // for testing
+            static CDS_CONSTEXPR bool const c_bExtractSupported = false;
+            static CDS_CONSTEXPR bool const c_bLoadFactorDepended = true;
         };
 
         // for non-sequential ordered containers
@@ -175,9 +192,14 @@ namespace map2 {
 
             resizing_policy_t   m_placeHolder;
         public:
-            RefinableHashMap_ord( size_t /*nCapacity*/, size_t nLoadFactor )
-                : base_class( 0, *(new(&m_placeHolder) resizing_policy_t( nLoadFactor * 1024 )) )
+            template <class Config>
+            RefinableHashMap_ord( Config const& cfg )
+                : base_class( 0, *(new(&m_placeHolder) resizing_policy_t( cfg.c_nMaxLoadFactor * 1024 )) )
             {}
+
+            // for testing
+            static CDS_CONSTEXPR bool const c_bExtractSupported = false;
+            static CDS_CONSTEXPR bool const c_bLoadFactorDepended = false;
         };