From e508dddc2cfefa58140bd04327ede89fcda3e0ea Mon Sep 17 00:00:00 2001 From: khizmax Date: Wed, 29 Oct 2014 23:35:46 +0300 Subject: [PATCH] SplitListMap refactoring --- cds/container/details/make_michael_list.h | 2 +- cds/container/split_list_map.h | 2 +- cds/container/split_list_map_nogc.h | 2 +- cds/container/split_list_map_rcu.h | 129 ++++++++---------- projects/Win/vc12/cds.vcxproj | 12 +- projects/Win/vc12/hdr-test-deque.vcxproj | 12 +- projects/Win/vc12/hdr-test-map.vcxproj | 16 +-- .../Win/vc12/hdr-test-map.vcxproj.filters | 12 +- projects/Win/vc12/hdr-test-misc.vcxproj | 12 +- .../Win/vc12/hdr-test-ordered-list.vcxproj | 12 +- .../Win/vc12/hdr-test-priority_queue.vcxproj | 12 +- projects/Win/vc12/hdr-test-queue.vcxproj | 12 +- projects/Win/vc12/hdr-test-set.vcxproj | 12 +- projects/Win/vc12/hdr-test-stack.vcxproj | 12 +- .../Win/vc12/hdr-test-striped-set.vcxproj | 12 +- projects/Win/vc12/hdr-test-tree.vcxproj | 12 +- projects/Win/vc12/unit-map-delodd.vcxproj | 12 +- projects/Win/vc12/unit-map-find.vcxproj | 12 +- projects/Win/vc12/unit-map-insdel.vcxproj | 12 +- projects/Win/vc12/unit-misc.vcxproj | 12 +- projects/Win/vc12/unit-pqueue.vcxproj | 12 +- projects/Win/vc12/unit-prerequisites.vcxproj | 12 +- projects/Win/vc12/unit-queue.vcxproj | 12 +- projects/Win/vc12/unit-set-delodd.vcxproj | 12 +- projects/Win/vc12/unit-set-insdel.vcxproj | 12 +- projects/Win/vc12/unit-stack.vcxproj | 12 +- projects/source.test-hdr.mk | 4 +- tests/test-hdr/map/hdr_map.h | 58 ++++++-- ..._map_ptb.cpp => hdr_splitlist_map_dhp.cpp} | 60 ++++++-- tests/test-hdr/map/hdr_splitlist_map_hp.cpp | 43 +++++- ...ptb.cpp => hdr_splitlist_map_lazy_dhp.cpp} | 60 ++++++-- .../map/hdr_splitlist_map_lazy_hp.cpp | 42 +++++- .../map/hdr_splitlist_map_lazy_nogc.cpp | 42 +++++- .../map/hdr_splitlist_map_lazy_rcu_gpb.cpp | 44 +++++- .../map/hdr_splitlist_map_lazy_rcu_gpi.cpp | 44 +++++- .../map/hdr_splitlist_map_lazy_rcu_gpt.cpp | 45 +++++- .../map/hdr_splitlist_map_lazy_rcu_shb.cpp | 48 ++++++- .../map/hdr_splitlist_map_lazy_rcu_sht.cpp | 49 +++++-- tests/test-hdr/map/hdr_splitlist_map_nogc.cpp | 43 +++++- .../map/hdr_splitlist_map_rcu_gpb.cpp | 44 +++++- .../map/hdr_splitlist_map_rcu_gpi.cpp | 45 +++++- .../map/hdr_splitlist_map_rcu_gpt.cpp | 44 +++++- .../map/hdr_splitlist_map_rcu_shb.cpp | 47 ++++++- .../map/hdr_splitlist_map_rcu_sht.cpp | 47 ++++++- 44 files changed, 861 insertions(+), 351 deletions(-) rename tests/test-hdr/map/{hdr_splitlist_map_ptb.cpp => hdr_splitlist_map_dhp.cpp} (67%) rename tests/test-hdr/map/{hdr_splitlist_map_lazy_ptb.cpp => hdr_splitlist_map_lazy_dhp.cpp} (64%) diff --git a/cds/container/details/make_michael_list.h b/cds/container/details/make_michael_list.h index e452ead1..f0aa14ed 100644 --- a/cds/container/details/make_michael_list.h +++ b/cds/container/details/make_michael_list.h @@ -67,7 +67,7 @@ namespace cds { namespace container { typedef intrusive::michael_list::base_hook< opt::gc > hook; typedef node_deallocator disposer; typedef cds::details::compare_wrapper< node_type, key_comparator, value_accessor > compare; - static CDS_CONSTEXPR const opt::link_check_type link_checker = cds::intrusive::lazy_list::traits::link_checker; + static CDS_CONSTEXPR const opt::link_check_type link_checker = cds::intrusive::michael_list::traits::link_checker; }; typedef intrusive::MichaelList type; diff --git a/cds/container/split_list_map.h b/cds/container/split_list_map.h index b6a50e56..0128b92d 100644 --- a/cds/container/split_list_map.h +++ b/cds/container/split_list_map.h @@ -334,7 +334,7 @@ namespace cds { namespace container { \p second is true if new item has been added or \p false if the item with \p key already is in the list. - @warning For \ref cds_intrusive_MichaelKVList_hp "MichaelKVList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting". + @warning For \ref cds_intrusive_MichaelKVList_hp "MichaelKVList" as the ordered list see \ref cds_intrusive_item_creating "insert item troubleshooting". \ref cds_intrusive_LazyKVList_hp "LazyKVList" provides exclusive access to inserted item and does not require any node-level synchronization. */ diff --git a/cds/container/split_list_map_nogc.h b/cds/container/split_list_map_nogc.h index d230b77b..ad7b785d 100644 --- a/cds/container/split_list_map_nogc.h +++ b/cds/container/split_list_map_nogc.h @@ -59,7 +59,7 @@ namespace cds { namespace container { protected: //@cond - typedef typename base_class::options::traits::key_accessor key_accessor; + typedef typename base_class::traits::key_accessor key_accessor; //@endcond public: diff --git a/cds/container/split_list_map_rcu.h b/cds/container/split_list_map_rcu.h index 17493ecf..c9d2d7e2 100644 --- a/cds/container/split_list_map_rcu.h +++ b/cds/container/split_list_map_rcu.h @@ -20,26 +20,22 @@ namespace cds { namespace container { Template parameters: - \p RCU - one of \ref cds_urcu_gc "RCU type" - - \p Key - key type of an item stored in the map. It should be copy-constructible - - \p Value - value type stored in the map - - \p Traits - type traits, default is split_list::type_traits. Instead of declaring split_list::type_traits -based - struct you may apply option-based notation with split_list::make_traits metafunction. + - \p Key - key type to be stored in the map + - \p Value - value type to be stored in the map + - \p Traits - type traits, default is \p split_list::traits. Instead of declaring \p %split_list::traits -based + struct you may apply option-based notation with \p split_list::make_traits metafunction. Iterators - The class supports a forward iterator (\ref iterator and \ref const_iterator). - The iteration is unordered. - + The class supports a forward unordered iterator (\ref iterator and \ref const_iterator). You may iterate over split-list map items only under RCU lock. Only in this case the iterator is thread-safe since while RCU is locked any map's item cannot be reclaimed. - - The requirement of RCU lock during iterating means that deletion of the elements (i.e. \ref erase) + The requirement of RCU lock during iterating means that deletion of the elements is not possible. - @warning The iterator object cannot be passed between threads - - \warning Due to concurrent nature of split-list map it is not guarantee that you can iterate + @warning The iterator object cannot be passed between threads. + Due to concurrent nature of split-list map it is not guarantee that you can iterate all elements in the map: any concurrent deletion can exclude the element pointed by the iterator from the map, and your iteration can be terminated before end of the map. Therefore, such iteration is more suitable for debugging purposes @@ -71,8 +67,8 @@ namespace cds { namespace container { \par Usage You should decide what garbage collector you want, and what ordered list you want to use. Split-ordered list - is original data structure based on an ordered list. Suppose, you want construct split-list map based on cds::urcu::general_buffered<> GC - and MichaelList as ordered list implementation. Your map should map \p int key to std::string value. + is original data structure based on an ordered list. Suppose, you want construct split-list map based on \p cds::urcu::general_buffered<> GC + and \p MichaelList as ordered list implementation. Your map should map \p int key to \p std::string value. So, you beginning your program with following include: \code #include @@ -83,26 +79,26 @@ namespace cds { namespace container { \endcode The inclusion order is important: - first, include one of \ref cds_urcu_gc "RCU implementation" (cds/urcu/general_buffered.h in our case) - - second, include file for ordered-list implementation (for this example, cds/container/michael_list_rcu.h), + - second, include the header of ordered-list implementation (for this example, cds/container/michael_list_rcu.h), - then, the header for RCU-based split-list map cds/container/split_list_map_rcu.h. Now, you should declare traits for split-list map. The main parts of traits are a hash functor for the map key and a comparing functor for ordered list. - We use std::hash as hash functor and std::less predicate as comparing functor. + We use \p std::hash and \p std::less. - The second attention: instead of using %MichaelList in %SplitListMap traits we use a tag cds::contaner::michael_list_tag + The second attention: instead of using \p %MichaelList in \p %SplitListMap traits we use a tag \p ds::contaner::michael_list_tag for the Michael's list. The split-list requires significant support from underlying ordered list class and it is not good idea to dive you into deep implementation details of split-list and ordered list interrelations. The tag paradigm simplifies split-list interface. \code // SplitListMap traits - struct foo_set_traits: public cc::split_list::type_traits + struct foo_set_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list ; // what type of ordered list we want to use typedef std::hash hash ; // hash functor for the key stored in split-list map // Type traits for our MichaelList class - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef std::less less ; // use our std::less predicate as comparator to order list nodes }; @@ -114,7 +110,7 @@ namespace cds { namespace container { typedef cc::SplitListMap< cds::urcu::gc >, int, std::string, foo_set_traits > int_string_map; \endcode - You may use the modern option-based declaration instead of classic type-traits-based one: + You may use the modern option-based declaration instead of classic traits-based one: \code typedef cc:SplitListMap< cds::urcu::gc > // RCU type @@ -131,21 +127,20 @@ namespace cds { namespace container { >::type > int_string_map; \endcode - In case of option-based declaration using split_list::make_traits metafunction the struct \p foo_set_traits is not required. + In case of option-based declaration using \p split_list::make_traits metafunction the struct \p foo_set_traits is not required. Now, the map of type \p int_string_map is ready to use in your program. - Note that in this example we show only mandatory type_traits parts, optional ones is the default and they are inherited - from cds::container::split_list::type_traits. - The cds library contains many other options for deep tuning of behavior of the split-list and - ordered-list containers. + Note that in this example we show only mandatory \p traits parts, optional ones is the default and they are inherited + from cds::container::split_list::traits. + There are many other useful options for deep tuning the split-list and ordered-list containers. */ template < class RCU, typename Key, typename Value, #ifdef CDS_DOXYGEN_INVOKED - class Traits = split_list::type_traits + class Traits = split_list::traits #else class Traits #endif @@ -166,26 +161,26 @@ namespace cds { namespace container { //@endcond public: - typedef typename base_class::gc gc ; ///< Garbage collector - typedef Traits options ; ///< ]p Traits template argument - typedef Key key_type ; ///< key type - typedef Value mapped_type ; ///< type of value stored in the map + typedef cds::urcu::gc< RCU > gc; ///< Garbage collector + typedef Key key_type; ///< key type + typedef Value mapped_type; ///< type of value to be stored in the map + typedef Traits traits; ///< Map traits - typedef std::pair value_type ; ///< key-value pair type - typedef typename base_class::ordered_list ordered_list; ///< Underlying ordered list class - typedef typename base_class::key_comparator key_comparator ; ///< key comparison functor + typedef std::pair value_type; ///< key-value pair type + typedef typename base_class::ordered_list ordered_list; ///< Underlying ordered list class + typedef typename base_class::key_comparator key_comparator; ///< key comparison functor - typedef typename base_class::hash hash ; ///< Hash functor for \ref key_type - typedef typename base_class::item_counter item_counter ; ///< Item counter type + typedef typename base_class::hash hash; ///< Hash functor for \ref key_type + typedef typename base_class::item_counter item_counter; ///< Item counter type - typedef typename base_class::rcu_lock rcu_lock ; ///< RCU scoped lock - typedef typename base_class::exempt_ptr exempt_ptr ; ///< pointer to extracted node + typedef typename base_class::rcu_lock rcu_lock; ///< RCU scoped lock + typedef typename base_class::exempt_ptr exempt_ptr; ///< pointer to extracted node /// Group of \p extract_xxx functions require external locking if underlying ordered list requires that static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; protected: //@cond - typedef typename base_class::maker::type_traits::key_accessor key_accessor; + typedef typename base_class::maker::traits::key_accessor key_accessor; //@endcond public: @@ -243,8 +238,8 @@ namespace cds { namespace container { /// Initializes split-ordered map of default capacity /** The default capacity is defined in bucket table constructor. - See intrusive::split_list::expandable_bucket_table, intrusive::split_list::static_bucket_table - which selects by intrusive::split_list::dynamic_bucket_table option. + See \p intrusive::split_list::expandable_bucket_table, \p intrusive::split_list::static_bucket_table + which selects by \p split_list::dynamic_bucket_table option. */ SplitListMap() : base_class() @@ -252,7 +247,7 @@ namespace cds { namespace container { /// Initializes split-ordered map SplitListMap( - size_t nItemCount ///< estimate average item count + size_t nItemCount ///< estimated average item count , size_t nLoadFactor = 1 ///< load factor - average item count per bucket. Small integer up to 10, default is 1. ) : base_class( nItemCount, nLoadFactor ) @@ -261,12 +256,11 @@ namespace cds { namespace container { public: /// Inserts new node with key and default value /** - The function creates a node with \p key and default value, and then inserts the node created into the map. + The function creates a node with \p key and the default value, and then inserts the node created into the map. Preconditions: - - The \ref key_type should be constructible from value of type \p K. - In trivial case, \p K is equal to \ref key_type. - - The \ref mapped_type should be default-constructible. + - The \p key_type should be constructible from value of type \p K. + - The \p mapped_type should be default-constructible. The function applies RCU lock internally. @@ -282,11 +276,11 @@ namespace cds { namespace container { /// Inserts new node /** The function creates a node with copy of \p val value - and then inserts the node created into the map. + and then inserts the node into the map. Preconditions: - - The \ref key_type should be constructible from \p key of type \p K. - - The \ref mapped_type should be constructible from \p val of type \p V. + - The \p key_type should be constructible from \p key of type \p K. + - The \p mapped_type should be constructible from \p val of type \p V. The function applies RCU lock internally. @@ -314,14 +308,11 @@ namespace cds { namespace container { - item.first is a const reference to item's key that cannot be changed. - item.second is a reference to item's value that may be changed. - It should be keep in mind that concurrent modifications of \p item.second may be possible. - User-defined functor \p func should guarantee that during changing item's value no any other changes + It should be keep in mind that concurrent modifications of \p item.second in \p func body + should be careful. You shouldf guarantee that during changing item's value in \p func no any other changes could be made on this \p item by concurrent threads. - The user-defined functor can be passed by reference using \p std::ref - and it is called only if inserting is successful. - - The key_type should be constructible from value of type \p K. + \p func is called only if inserting is successful. The function allows to split creating of new item into two part: - create item from \p key; @@ -340,7 +331,7 @@ namespace cds { namespace container { return base_class::insert( std::make_pair( key, mapped_type() ), func ); } - /// For key \p key inserts data of type \ref mapped_type constructed with std::forward(args)... + /// For key \p key inserts data of type \p mapped_type created in-place from \p args /** \p key_type should be constructible from type \p K @@ -359,35 +350,32 @@ namespace cds { namespace container { The operation performs inserting or changing data with lock-free manner. If the \p key not found in the map, then the new item created from \p key - is inserted into the map (note that in this case the \ref key_type should be - constructible from type \p K). + is inserted into the map; in this case the \p key_type should be + constructible from type \p K. Otherwise, the functor \p func is called with item found. - The functor \p Func may be a function with signature: - \code - void func( bool bNew, value_type& item ); - \endcode - or a functor: + The functor \p Func signature is: \code struct my_functor { void operator()( bool bNew, value_type& item ); }; \endcode - with arguments: - \p bNew - \p true if the item has been inserted, \p false otherwise - \p item - item of the list - The functor may change any fields of the \p item.second that is \ref mapped_type; + The functor may change any fields of the \p item.second that is \p mapped_type; however, \p func must guarantee that during changing no any other modifications could be made on this item by concurrent threads. - You may pass \p func argument by reference using \p std::ref - The function applies RCU lock internally. Returns std::pair where \p first is true if operation is successfull, \p second is true if new item has been added or \p false if the item with \p key already is in the list. + + @warning For \ref cds_intrusive_MichaelKVList_hp "MichaelKVList" as the ordered list see \ref cds_intrusive_item_creating "insert item troubleshooting". + \ref cds_intrusive_LazyKVList_hp "LazyKVList" provides exclusive access to inserted item and does not require any node-level + synchronization. */ template std::pair ensure( K const& key, Func func ) @@ -638,13 +626,7 @@ namespace cds { namespace container { return base_class::get_with( key, cds::details::predicate_wrapper()); } - /// Clears the map (non-atomic) - /** - The function unlink all items from the map. - The function is not atomic and not lock-free and should be used for debugging only. - - RCU \p synchronize method can be called. RCU should not be locked. - */ + /// Clears the map (not atomic) void clear() { base_class::clear(); @@ -667,7 +649,6 @@ namespace cds { namespace container { } }; - }} // namespace cds::container #endif // #ifndef __CDS_CONTAINER_SPLIT_LIST_MAP_RCU_H diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index b6345882..13e256b8 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -236,7 +236,7 @@ - /wd4512 /wd4127 %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) @@ -295,7 +295,7 @@ X64 - /wd4512 /wd4127 %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) @@ -360,7 +360,7 @@ - /wd4512 /wd4127 %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -460,7 +460,7 @@ X64 - /wd4512 /wd4127 %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -561,7 +561,7 @@ - /wd4512 /wd4127 %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) @@ -592,7 +592,7 @@ X64 - /wd4512 /wd4127 %(AdditionalOptions) + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-deque.vcxproj b/projects/Win/vc12/hdr-test-deque.vcxproj index 50aac2f0..1193a1eb 100644 --- a/projects/Win/vc12/hdr-test-deque.vcxproj +++ b/projects/Win/vc12/hdr-test-deque.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -270,7 +270,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -330,7 +330,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -406,7 +406,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -485,7 +485,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -517,7 +517,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-map.vcxproj b/projects/Win/vc12/hdr-test-map.vcxproj index 5bc25c98..3c43895e 100644 --- a/projects/Win/vc12/hdr-test-map.vcxproj +++ b/projects/Win/vc12/hdr-test-map.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -267,7 +267,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -326,7 +326,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -401,7 +401,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -477,7 +477,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -508,7 +508,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -577,17 +577,17 @@ + + - - diff --git a/projects/Win/vc12/hdr-test-map.vcxproj.filters b/projects/Win/vc12/hdr-test-map.vcxproj.filters index fd3fa960..9777cdcf 100644 --- a/projects/Win/vc12/hdr-test-map.vcxproj.filters +++ b/projects/Win/vc12/hdr-test-map.vcxproj.filters @@ -58,15 +58,9 @@ split_list - - split_list - split_list - - split_list - striped @@ -181,6 +175,12 @@ michael + + split_list + + + split_list + diff --git a/projects/Win/vc12/hdr-test-misc.vcxproj b/projects/Win/vc12/hdr-test-misc.vcxproj index a347ce2f..bb5e6142 100644 --- a/projects/Win/vc12/hdr-test-misc.vcxproj +++ b/projects/Win/vc12/hdr-test-misc.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -267,7 +267,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -326,7 +326,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -401,7 +401,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -477,7 +477,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -508,7 +508,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-ordered-list.vcxproj b/projects/Win/vc12/hdr-test-ordered-list.vcxproj index dee2447c..ec291a9d 100644 --- a/projects/Win/vc12/hdr-test-ordered-list.vcxproj +++ b/projects/Win/vc12/hdr-test-ordered-list.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -267,7 +267,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -326,7 +326,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -401,7 +401,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -477,7 +477,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -508,7 +508,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-priority_queue.vcxproj b/projects/Win/vc12/hdr-test-priority_queue.vcxproj index d0e02c76..325b0cfe 100644 --- a/projects/Win/vc12/hdr-test-priority_queue.vcxproj +++ b/projects/Win/vc12/hdr-test-priority_queue.vcxproj @@ -222,7 +222,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -281,7 +281,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -340,7 +340,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -415,7 +415,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -491,7 +491,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -522,7 +522,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-queue.vcxproj b/projects/Win/vc12/hdr-test-queue.vcxproj index bdcc83c3..5a7920e3 100644 --- a/projects/Win/vc12/hdr-test-queue.vcxproj +++ b/projects/Win/vc12/hdr-test-queue.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -267,7 +267,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -326,7 +326,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -401,7 +401,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -477,7 +477,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -508,7 +508,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-set.vcxproj b/projects/Win/vc12/hdr-test-set.vcxproj index bcf2e1f3..342715c1 100644 --- a/projects/Win/vc12/hdr-test-set.vcxproj +++ b/projects/Win/vc12/hdr-test-set.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -267,7 +267,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -326,7 +326,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -401,7 +401,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -477,7 +477,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -508,7 +508,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-stack.vcxproj b/projects/Win/vc12/hdr-test-stack.vcxproj index 2f1dea80..28f258c1 100644 --- a/projects/Win/vc12/hdr-test-stack.vcxproj +++ b/projects/Win/vc12/hdr-test-stack.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -267,7 +267,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -326,7 +326,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -401,7 +401,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -477,7 +477,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -508,7 +508,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-striped-set.vcxproj b/projects/Win/vc12/hdr-test-striped-set.vcxproj index 57ac00af..b2f0c87b 100644 --- a/projects/Win/vc12/hdr-test-striped-set.vcxproj +++ b/projects/Win/vc12/hdr-test-striped-set.vcxproj @@ -261,7 +261,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -320,7 +320,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -379,7 +379,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -454,7 +454,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -530,7 +530,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -561,7 +561,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/hdr-test-tree.vcxproj b/projects/Win/vc12/hdr-test-tree.vcxproj index c671bcbe..30ac4451 100644 --- a/projects/Win/vc12/hdr-test-tree.vcxproj +++ b/projects/Win/vc12/hdr-test-tree.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -267,7 +267,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -326,7 +326,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -401,7 +401,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Full AnySuitable true @@ -477,7 +477,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -508,7 +508,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) diff --git a/projects/Win/vc12/unit-map-delodd.vcxproj b/projects/Win/vc12/unit-map-delodd.vcxproj index 74d6bcbb..206ec842 100644 --- a/projects/Win/vc12/unit-map-delodd.vcxproj +++ b/projects/Win/vc12/unit-map-delodd.vcxproj @@ -211,7 +211,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -259,7 +259,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -286,7 +286,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -340,7 +340,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -364,7 +364,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -424,7 +424,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-map-find.vcxproj b/projects/Win/vc12/unit-map-find.vcxproj index 67710f3a..81a78e9c 100644 --- a/projects/Win/vc12/unit-map-find.vcxproj +++ b/projects/Win/vc12/unit-map-find.vcxproj @@ -213,7 +213,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -261,7 +261,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -288,7 +288,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -342,7 +342,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -366,7 +366,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -426,7 +426,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-map-insdel.vcxproj b/projects/Win/vc12/unit-map-insdel.vcxproj index 8f028f22..f9bc6e8d 100644 --- a/projects/Win/vc12/unit-map-insdel.vcxproj +++ b/projects/Win/vc12/unit-map-insdel.vcxproj @@ -216,7 +216,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -264,7 +264,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -291,7 +291,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -345,7 +345,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -369,7 +369,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -429,7 +429,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-misc.vcxproj b/projects/Win/vc12/unit-misc.vcxproj index a3e4ebb5..2946b2b1 100644 --- a/projects/Win/vc12/unit-misc.vcxproj +++ b/projects/Win/vc12/unit-misc.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -256,7 +256,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -283,7 +283,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -337,7 +337,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -361,7 +361,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -421,7 +421,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-pqueue.vcxproj b/projects/Win/vc12/unit-pqueue.vcxproj index ab6a0784..10cfc219 100644 --- a/projects/Win/vc12/unit-pqueue.vcxproj +++ b/projects/Win/vc12/unit-pqueue.vcxproj @@ -221,7 +221,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -269,7 +269,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -296,7 +296,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -350,7 +350,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -374,7 +374,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -434,7 +434,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-prerequisites.vcxproj b/projects/Win/vc12/unit-prerequisites.vcxproj index dd5bfac2..7d7b9881 100644 --- a/projects/Win/vc12/unit-prerequisites.vcxproj +++ b/projects/Win/vc12/unit-prerequisites.vcxproj @@ -198,7 +198,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -236,7 +236,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -258,7 +258,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -302,7 +302,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -321,7 +321,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -367,7 +367,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-queue.vcxproj b/projects/Win/vc12/unit-queue.vcxproj index 9b890e1b..218ec906 100644 --- a/projects/Win/vc12/unit-queue.vcxproj +++ b/projects/Win/vc12/unit-queue.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -256,7 +256,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -283,7 +283,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -337,7 +337,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -361,7 +361,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -421,7 +421,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-set-delodd.vcxproj b/projects/Win/vc12/unit-set-delodd.vcxproj index 94ba0240..7728c01c 100644 --- a/projects/Win/vc12/unit-set-delodd.vcxproj +++ b/projects/Win/vc12/unit-set-delodd.vcxproj @@ -211,7 +211,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -259,7 +259,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -286,7 +286,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -340,7 +340,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -364,7 +364,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -424,7 +424,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-set-insdel.vcxproj b/projects/Win/vc12/unit-set-insdel.vcxproj index 523e1b76..865dcd0e 100644 --- a/projects/Win/vc12/unit-set-insdel.vcxproj +++ b/projects/Win/vc12/unit-set-insdel.vcxproj @@ -222,7 +222,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -270,7 +270,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -297,7 +297,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -351,7 +351,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -375,7 +375,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -435,7 +435,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/Win/vc12/unit-stack.vcxproj b/projects/Win/vc12/unit-stack.vcxproj index 4e920c93..0a7f314f 100644 --- a/projects/Win/vc12/unit-stack.vcxproj +++ b/projects/Win/vc12/unit-stack.vcxproj @@ -208,7 +208,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -256,7 +256,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -283,7 +283,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -337,7 +337,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) Disabled $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) @@ -361,7 +361,7 @@ - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true @@ -421,7 +421,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /Zc:inline %(AdditionalOptions) MaxSpeed AnySuitable true diff --git a/projects/source.test-hdr.mk b/projects/source.test-hdr.mk index 740cffce..76148cea 100644 --- a/projects/source.test-hdr.mk +++ b/projects/source.test-hdr.mk @@ -32,7 +32,7 @@ CDS_TESTHDR_MAP := \ tests/test-hdr/map/hdr_skiplist_map_rcu_sht.cpp \ tests/test-hdr/map/hdr_skiplist_map_nogc.cpp \ tests/test-hdr/map/hdr_splitlist_map_hp.cpp \ - tests/test-hdr/map/hdr_splitlist_map_ptb.cpp \ + tests/test-hdr/map/hdr_splitlist_map_dhp.cpp \ tests/test-hdr/map/hdr_splitlist_map_nogc.cpp \ tests/test-hdr/map/hdr_splitlist_map_rcu_gpi.cpp \ tests/test-hdr/map/hdr_splitlist_map_rcu_gpb.cpp \ @@ -40,7 +40,7 @@ CDS_TESTHDR_MAP := \ tests/test-hdr/map/hdr_splitlist_map_rcu_shb.cpp \ tests/test-hdr/map/hdr_splitlist_map_rcu_sht.cpp \ tests/test-hdr/map/hdr_splitlist_map_lazy_hp.cpp \ - tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp \ + tests/test-hdr/map/hdr_splitlist_map_lazy_dhp.cpp \ tests/test-hdr/map/hdr_splitlist_map_lazy_nogc.cpp \ tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpi.cpp \ tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpb.cpp \ diff --git a/tests/test-hdr/map/hdr_map.h b/tests/test-hdr/map/hdr_map.h index e48f60d3..5f96b1b9 100644 --- a/tests/test-hdr/map/hdr_map.h +++ b/tests/test-hdr/map/hdr_map.h @@ -695,66 +695,82 @@ namespace map { void Split_HP_cmp(); void Split_HP_less(); void Split_HP_cmpmix(); + void Split_HP_cmpmix_stat(); - 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_DHP_cmpmix_stat(); void Split_RCU_GPI_cmp(); void Split_RCU_GPI_less(); void Split_RCU_GPI_cmpmix(); + void Split_RCU_GPI_cmpmix_stat(); void Split_RCU_GPB_cmp(); void Split_RCU_GPB_less(); void Split_RCU_GPB_cmpmix(); + void Split_RCU_GPB_cmpmix_stat(); void Split_RCU_GPT_cmp(); void Split_RCU_GPT_less(); void Split_RCU_GPT_cmpmix(); + void Split_RCU_GPT_cmpmix_stat(); void Split_RCU_SHB_cmp(); void Split_RCU_SHB_less(); void Split_RCU_SHB_cmpmix(); + void Split_RCU_SHB_cmpmix_stat(); void Split_RCU_SHT_cmp(); void Split_RCU_SHT_less(); void Split_RCU_SHT_cmpmix(); + void Split_RCU_SHT_cmpmix_stat(); void Split_nogc_cmp(); void Split_nogc_less(); void Split_nogc_cmpmix(); + void Split_nogc_cmpmix_stat(); void Split_Lazy_HP_cmp(); void Split_Lazy_HP_less(); void Split_Lazy_HP_cmpmix(); + void Split_Lazy_HP_cmpmix_stat(); - 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_DHP_cmpmix_stat(); void Split_Lazy_RCU_GPI_cmp(); void Split_Lazy_RCU_GPI_less(); void Split_Lazy_RCU_GPI_cmpmix(); + void Split_Lazy_RCU_GPI_cmpmix_stat(); void Split_Lazy_RCU_GPB_cmp(); void Split_Lazy_RCU_GPB_less(); void Split_Lazy_RCU_GPB_cmpmix(); + void Split_Lazy_RCU_GPB_cmpmix_stat(); void Split_Lazy_RCU_GPT_cmp(); void Split_Lazy_RCU_GPT_less(); void Split_Lazy_RCU_GPT_cmpmix(); + void Split_Lazy_RCU_GPT_cmpmix_stat(); void Split_Lazy_RCU_SHB_cmp(); void Split_Lazy_RCU_SHB_less(); void Split_Lazy_RCU_SHB_cmpmix(); + void Split_Lazy_RCU_SHB_cmpmix_stat(); void Split_Lazy_RCU_SHT_cmp(); void Split_Lazy_RCU_SHT_less(); void Split_Lazy_RCU_SHT_cmpmix(); + void Split_Lazy_RCU_SHT_cmpmix_stat(); void Split_Lazy_nogc_cmp(); void Split_Lazy_nogc_less(); void Split_Lazy_nogc_cmpmix(); + void Split_Lazy_nogc_cmpmix_stat(); CPPUNIT_TEST_SUITE(HashMapHdrTest) CPPUNIT_TEST(Michael_HP_cmp) @@ -824,67 +840,83 @@ namespace map { CPPUNIT_TEST(Split_HP_cmp) CPPUNIT_TEST(Split_HP_less) CPPUNIT_TEST(Split_HP_cmpmix) + CPPUNIT_TEST( Split_HP_cmpmix_stat ) - 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_DHP_cmpmix_stat ) CPPUNIT_TEST(Split_RCU_GPI_cmp) CPPUNIT_TEST(Split_RCU_GPI_less) CPPUNIT_TEST(Split_RCU_GPI_cmpmix) + CPPUNIT_TEST( Split_RCU_GPI_cmpmix_stat ) CPPUNIT_TEST(Split_RCU_GPB_cmp) CPPUNIT_TEST(Split_RCU_GPB_less) CPPUNIT_TEST(Split_RCU_GPB_cmpmix) + CPPUNIT_TEST( Split_RCU_GPB_cmpmix_stat ) CPPUNIT_TEST(Split_RCU_GPT_cmp) CPPUNIT_TEST(Split_RCU_GPT_less) CPPUNIT_TEST(Split_RCU_GPT_cmpmix) + CPPUNIT_TEST( Split_RCU_GPT_cmpmix_stat ) CPPUNIT_TEST(Split_RCU_SHB_cmp) CPPUNIT_TEST(Split_RCU_SHB_less) CPPUNIT_TEST(Split_RCU_SHB_cmpmix) + CPPUNIT_TEST( Split_RCU_SHB_cmpmix_stat ) CPPUNIT_TEST(Split_RCU_SHT_cmp) CPPUNIT_TEST(Split_RCU_SHT_less) CPPUNIT_TEST(Split_RCU_SHT_cmpmix) + CPPUNIT_TEST( Split_RCU_SHT_cmpmix_stat ) CPPUNIT_TEST(Split_nogc_cmp) CPPUNIT_TEST(Split_nogc_less) CPPUNIT_TEST(Split_nogc_cmpmix) + CPPUNIT_TEST( Split_nogc_cmpmix_stat ) CPPUNIT_TEST(Split_Lazy_HP_cmp) CPPUNIT_TEST(Split_Lazy_HP_less) CPPUNIT_TEST(Split_Lazy_HP_cmpmix) + CPPUNIT_TEST( Split_Lazy_HP_cmpmix_stat ) - 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_DHP_cmpmix_stat ) CPPUNIT_TEST(Split_Lazy_RCU_GPI_cmp) CPPUNIT_TEST(Split_Lazy_RCU_GPI_less) CPPUNIT_TEST(Split_Lazy_RCU_GPI_cmpmix) + CPPUNIT_TEST( Split_Lazy_RCU_GPI_cmpmix_stat ) CPPUNIT_TEST(Split_Lazy_RCU_GPB_cmp) CPPUNIT_TEST(Split_Lazy_RCU_GPB_less) CPPUNIT_TEST(Split_Lazy_RCU_GPB_cmpmix) + CPPUNIT_TEST( Split_Lazy_RCU_GPB_cmpmix_stat ) CPPUNIT_TEST(Split_Lazy_RCU_GPT_cmp) CPPUNIT_TEST(Split_Lazy_RCU_GPT_less) CPPUNIT_TEST(Split_Lazy_RCU_GPT_cmpmix) + CPPUNIT_TEST( Split_Lazy_RCU_GPT_cmpmix_stat ) CPPUNIT_TEST(Split_Lazy_RCU_SHB_cmp) CPPUNIT_TEST(Split_Lazy_RCU_SHB_less) CPPUNIT_TEST(Split_Lazy_RCU_SHB_cmpmix) + CPPUNIT_TEST( Split_Lazy_RCU_SHB_cmpmix_stat ) CPPUNIT_TEST(Split_Lazy_RCU_SHT_cmp) CPPUNIT_TEST(Split_Lazy_RCU_SHT_less) CPPUNIT_TEST(Split_Lazy_RCU_SHT_cmpmix) + CPPUNIT_TEST( Split_Lazy_RCU_SHT_cmpmix_stat ) CPPUNIT_TEST(Split_Lazy_nogc_cmp) CPPUNIT_TEST(Split_Lazy_nogc_less) CPPUNIT_TEST(Split_Lazy_nogc_cmpmix) - CPPUNIT_TEST_SUITE_END() + CPPUNIT_TEST( Split_Lazy_nogc_cmpmix_stat ) + CPPUNIT_TEST_SUITE_END() }; } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp b/tests/test-hdr/map/hdr_splitlist_map_dhp.cpp similarity index 67% rename from tests/test-hdr/map/hdr_splitlist_map_ptb.cpp rename to tests/test-hdr/map/hdr_splitlist_map_dhp.cpp index 113b8245..17e1fa89 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_ptb.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_dhp.cpp @@ -7,7 +7,7 @@ namespace map { namespace { - struct PTB_cmp_traits: public cc::split_list::type_traits + struct DHP_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -15,13 +15,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct PTB_less_traits: public cc::split_list::type_traits + struct DHP_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -29,34 +29,39 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct PTB_cmpmix_traits: public cc::split_list::type_traits + struct DHP_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct DHP_cmpmix_stat_traits : public DHP_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } - void HashMapHdrTest::Split_PTB_cmp() + void HashMapHdrTest::Split_DHP_cmp() { // traits-based version - typedef cc::SplitListMap< cds::gc::PTB, key_type, value_type, PTB_cmp_traits > map_type; + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_cmp_traits > map_type; test_int< map_type >(); // option-based version - typedef cc::SplitListMap< cds::gc::PTB, + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, cc::split_list::make_traits< @@ -75,14 +80,14 @@ namespace map { test_int< opt_map >(); } - void HashMapHdrTest::Split_PTB_less() + void HashMapHdrTest::Split_DHP_less() { // traits-based version - typedef cc::SplitListMap< cds::gc::PTB, key_type, value_type, PTB_less_traits > map_type; + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_less_traits > map_type; test_int< map_type >(); // option-based version - typedef cc::SplitListMap< cds::gc::PTB, + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, cc::split_list::make_traits< @@ -101,14 +106,14 @@ namespace map { test_int< opt_map >(); } - void HashMapHdrTest::Split_PTB_cmpmix() + void HashMapHdrTest::Split_DHP_cmpmix() { // traits-based version - typedef cc::SplitListMap< cds::gc::PTB, key_type, value_type, PTB_cmpmix_traits > map_type; + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_cmpmix_traits > map_type; test_int< map_type >(); // option-based version - typedef cc::SplitListMap< cds::gc::PTB, + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, cc::split_list::make_traits< @@ -126,6 +131,31 @@ namespace map { test_int< opt_map >(); } + void HashMapHdrTest::Split_DHP_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_cmpmix_stat_traits > map_type; + test_int< map_type >(); + + // option-based version + typedef cc::SplitListMap< cds::gc::DHP, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat< cc::split_list::stat<> > + ,cc::split_list::ordered_list_traits< + cc::michael_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_int< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_hp.cpp b/tests/test-hdr/map/hdr_splitlist_map_hp.cpp index 6e69f55e..59d84b1c 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_hp.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_hp.cpp @@ -7,7 +7,7 @@ namespace map { namespace { - struct HP_cmp_traits: public cc::split_list::type_traits + struct HP_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -15,13 +15,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct HP_less_traits: public cc::split_list::type_traits + struct HP_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -29,24 +29,30 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct HP_cmpmix_traits: public cc::split_list::type_traits + struct HP_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct HP_cmpmix_stat_traits : public HP_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; + } void HashMapHdrTest::Split_HP_cmp() @@ -126,6 +132,31 @@ namespace map { test_int< opt_map >(); } + void HashMapHdrTest::Split_HP_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< cds::gc::HP, key_type, value_type, HP_cmpmix_stat_traits > map_type; + test_int< map_type >(); + + // option-based version + typedef cc::SplitListMap< cds::gc::HP, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,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< std::less > + ,cc::opt::compare< cmp > + >::type + > + ,cds::opt::stat< cc::split_list::stat<>> + >::type + > opt_map; + test_int< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_dhp.cpp similarity index 64% rename from tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp rename to tests/test-hdr/map/hdr_splitlist_map_lazy_dhp.cpp index 6e7ab77e..b5a91bab 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_dhp.cpp @@ -7,7 +7,7 @@ namespace map { namespace { - struct PTB_cmp_traits: public cc::split_list::type_traits + struct DHP_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -15,13 +15,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct PTB_less_traits: public cc::split_list::type_traits + struct DHP_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -29,34 +29,39 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct PTB_cmpmix_traits: public cc::split_list::type_traits + struct DHP_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct DHP_cmpmix_stat_traits : public DHP_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } - void HashMapHdrTest::Split_Lazy_PTB_cmp() + void HashMapHdrTest::Split_Lazy_DHP_cmp() { // traits-based version - typedef cc::SplitListMap< cds::gc::PTB, key_type, value_type, PTB_cmp_traits > map_type; + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_cmp_traits > map_type; test_int< map_type >(); // option-based version - typedef cc::SplitListMap< cds::gc::PTB, + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, cc::split_list::make_traits< @@ -75,14 +80,14 @@ namespace map { test_int< opt_map >(); } - void HashMapHdrTest::Split_Lazy_PTB_less() + void HashMapHdrTest::Split_Lazy_DHP_less() { // traits-based version - typedef cc::SplitListMap< cds::gc::PTB, key_type, value_type, PTB_less_traits > map_type; + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_less_traits > map_type; test_int< map_type >(); // option-based version - typedef cc::SplitListMap< cds::gc::PTB, + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, cc::split_list::make_traits< @@ -101,14 +106,14 @@ namespace map { test_int< opt_map >(); } - void HashMapHdrTest::Split_Lazy_PTB_cmpmix() + void HashMapHdrTest::Split_Lazy_DHP_cmpmix() { // traits-based version - typedef cc::SplitListMap< cds::gc::PTB, key_type, value_type, PTB_cmpmix_traits > map_type; + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_cmpmix_traits > map_type; test_int< map_type >(); // option-based version - typedef cc::SplitListMap< cds::gc::PTB, + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, cc::split_list::make_traits< @@ -126,6 +131,31 @@ namespace map { test_int< opt_map >(); } + void HashMapHdrTest::Split_Lazy_DHP_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< cds::gc::DHP, key_type, value_type, DHP_cmpmix_stat_traits > map_type; + test_int< map_type >(); + + // option-based version + typedef cc::SplitListMap< cds::gc::DHP, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,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< std::less > + ,cc::opt::compare< cmp > + >::type + > + ,cc::opt::stat< cc::split_list::stat<>> + >::type + > opt_map; + test_int< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_hp.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_hp.cpp index 7803fa7b..ab9d7b63 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_hp.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_hp.cpp @@ -7,7 +7,7 @@ namespace map { namespace { - struct HP_cmp_traits: public cc::split_list::type_traits + struct HP_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -15,13 +15,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct HP_less_traits: public cc::split_list::type_traits + struct HP_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -29,24 +29,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct HP_cmpmix_traits: public cc::split_list::type_traits + struct HP_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct HP_cmpmix_stat_traits : public HP_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } void HashMapHdrTest::Split_Lazy_HP_cmp() @@ -126,6 +131,31 @@ namespace map { test_int< opt_map >(); } + void HashMapHdrTest::Split_Lazy_HP_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< cds::gc::HP, key_type, value_type, HP_cmpmix_stat_traits > map_type; + test_int< map_type >(); + + // option-based version + typedef cc::SplitListMap< cds::gc::HP, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,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< std::less > + ,cc::opt::compare< cmp > + >::type + > + ,cc::opt::stat< cc::split_list::stat<>> + >::type + > opt_map; + test_int< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_nogc.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_nogc.cpp index 2da207a1..b75a7465 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_nogc.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_nogc.cpp @@ -7,7 +7,7 @@ namespace map { namespace { - struct nogc_cmp_traits: public cc::split_list::type_traits + struct nogc_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -15,13 +15,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct nogc_less_traits: public cc::split_list::type_traits + struct nogc_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -29,24 +29,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct nogc_cmpmix_traits: public cc::split_list::type_traits + struct nogc_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct nogc_cmpmix_stat_traits : public nogc_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } void HashMapHdrTest::Split_Lazy_nogc_cmp() @@ -126,6 +131,31 @@ namespace map { test_int_nogc< opt_map >(); } + void HashMapHdrTest::Split_Lazy_nogc_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< cds::gc::nogc, key_type, value_type, nogc_cmpmix_stat_traits > map_type; + test_int_nogc< map_type >(); + + // option-based version + typedef cc::SplitListMap< cds::gc::nogc, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cds::opt::stat< cc::split_list::stat<> > + ,cc::split_list::ordered_list_traits< + cc::lazy_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_int_nogc< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpb.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpb.cpp index 3d0575e2..f83a2eb3 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpb.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpb.cpp @@ -10,7 +10,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::general_buffered<> > rcu_type; - struct RCU_GPB_cmp_traits: public cc::split_list::type_traits + struct RCU_GPB_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -18,13 +18,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_GPB_less_traits: public cc::split_list::type_traits + struct RCU_GPB_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -32,24 +32,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_GPB_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } void HashMapHdrTest::Split_Lazy_RCU_GPB_cmp() @@ -107,7 +112,7 @@ namespace map { void HashMapHdrTest::Split_Lazy_RCU_GPB_cmpmix() { // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_GPB_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; test_rcu< map_type >(); // option-based version @@ -129,6 +134,31 @@ namespace map { test_rcu< opt_map >(); } + void HashMapHdrTest::Split_Lazy_RCU_GPB_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat< cc::split_list::stat<> > + ,cc::split_list::ordered_list_traits< + cc::lazy_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpi.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpi.cpp index 6c7b5cc2..497ed749 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpi.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpi.cpp @@ -10,7 +10,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::general_instant<> > rcu_type; - struct RCU_GPI_cmp_traits: public cc::split_list::type_traits + struct RCU_GPI_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -18,13 +18,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_GPI_less_traits: public cc::split_list::type_traits + struct RCU_GPI_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -32,24 +32,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_GPI_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } void HashMapHdrTest::Split_Lazy_RCU_GPI_cmp() @@ -107,7 +112,7 @@ namespace map { void HashMapHdrTest::Split_Lazy_RCU_GPI_cmpmix() { // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_GPI_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; test_rcu< map_type >(); // option-based version @@ -129,6 +134,31 @@ namespace map { test_rcu< opt_map >(); } + void HashMapHdrTest::Split_Lazy_RCU_GPI_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat< cc::split_list::stat<> > + ,cc::split_list::ordered_list_traits< + cc::lazy_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpt.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpt.cpp index c3ed26ed..6e9ece77 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpt.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpt.cpp @@ -10,7 +10,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::general_threaded<> > rcu_type; - struct RCU_GPT_cmp_traits: public cc::split_list::type_traits + struct RCU_GPT_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -18,13 +18,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_GPT_less_traits: public cc::split_list::type_traits + struct RCU_GPT_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -32,24 +32,30 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_GPT_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; + } void HashMapHdrTest::Split_Lazy_RCU_GPT_cmp() @@ -107,7 +113,7 @@ namespace map { void HashMapHdrTest::Split_Lazy_RCU_GPT_cmpmix() { // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_GPT_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; test_rcu< map_type >(); // option-based version @@ -129,6 +135,31 @@ namespace map { test_rcu< opt_map >(); } + void HashMapHdrTest::Split_Lazy_RCU_GPT_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat< cc::split_list::stat<> > + ,cc::split_list::ordered_list_traits< + cc::lazy_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_shb.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_shb.cpp index f6199d50..68357cde 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_shb.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_shb.cpp @@ -11,7 +11,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::signal_buffered<> > rcu_type; - struct RCU_SHB_cmp_traits: public cc::split_list::type_traits + struct RCU_SHB_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -19,13 +19,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_SHB_less_traits: public cc::split_list::type_traits + struct RCU_SHB_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -33,24 +33,30 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_SHB_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; + } #endif @@ -114,7 +120,34 @@ namespace map { { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_SHB_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,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< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); +#endif + } + + void HashMapHdrTest::Split_Lazy_RCU_SHB_cmpmix_stat() + { +#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; test_rcu< map_type >(); // option-based version @@ -125,6 +158,7 @@ namespace map { cc::split_list::ordered_list ,cc::opt::hash< hash_int > ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat< cc::split_list::stat<> > ,cc::split_list::ordered_list_traits< cc::lazy_list::make_traits< cc::opt::less< std::less > diff --git a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_sht.cpp b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_sht.cpp index 8cf33209..ef2bfc32 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_sht.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_sht.cpp @@ -11,7 +11,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::signal_threaded<> > rcu_type; - struct RCU_SHT_cmp_traits: public cc::split_list::type_traits + struct RCU_SHT_cmp_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -19,13 +19,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_SHT_less_traits: public cc::split_list::type_traits + struct RCU_SHT_less_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -33,25 +33,30 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_SHT_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::lazy_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::lazy_list::type_traits + struct ordered_list_traits: public cc::lazy_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; - } + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; +} #endif void HashMapHdrTest::Split_Lazy_RCU_SHT_cmp() @@ -114,7 +119,34 @@ namespace map { { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_SHT_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,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< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); +#endif + } + + void HashMapHdrTest::Split_Lazy_RCU_SHT_cmpmix_stat() + { +#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; test_rcu< map_type >(); // option-based version @@ -125,6 +157,7 @@ namespace map { cc::split_list::ordered_list ,cc::opt::hash< hash_int > ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat< cc::split_list::stat<> > ,cc::split_list::ordered_list_traits< cc::lazy_list::make_traits< cc::opt::less< std::less > diff --git a/tests/test-hdr/map/hdr_splitlist_map_nogc.cpp b/tests/test-hdr/map/hdr_splitlist_map_nogc.cpp index 537893f1..4ba4f6a6 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_nogc.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_nogc.cpp @@ -7,7 +7,7 @@ namespace map { namespace { - struct nogc_cmp_traits: public cc::split_list::type_traits + struct nogc_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -15,13 +15,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct nogc_less_traits: public cc::split_list::type_traits + struct nogc_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -29,24 +29,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct nogc_cmpmix_traits: public cc::split_list::type_traits + struct nogc_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct nogc_cmpmix_stat_traits : public nogc_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } void HashMapHdrTest::Split_nogc_cmp() @@ -115,6 +120,7 @@ namespace map { cc::split_list::ordered_list ,cc::opt::hash< hash_int > ,cc::opt::item_counter< simple_item_counter > + , cc::opt::stat< cc::split_list::empty_stat > ,cc::split_list::ordered_list_traits< cc::michael_list::make_traits< cc::opt::less< std::less > @@ -126,6 +132,31 @@ namespace map { test_int_nogc< opt_map >(); } + void HashMapHdrTest::Split_nogc_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< cds::gc::nogc, key_type, value_type, nogc_cmpmix_stat_traits > map_type; + test_int_nogc< map_type >(); + + // option-based version + typedef cc::SplitListMap< cds::gc::nogc, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat< cc::split_list::stat<> > + ,cc::split_list::ordered_list_traits< + cc::michael_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_int_nogc< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_rcu_gpb.cpp b/tests/test-hdr/map/hdr_splitlist_map_rcu_gpb.cpp index e90aa0ae..db95da0c 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_rcu_gpb.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_rcu_gpb.cpp @@ -10,7 +10,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::general_buffered<> > rcu_type; - struct RCU_GPB_cmp_traits: public cc::split_list::type_traits + struct RCU_GPB_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -18,13 +18,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_GPB_less_traits: public cc::split_list::type_traits + struct RCU_GPB_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -32,24 +32,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_GPB_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } void HashMapHdrTest::Split_RCU_GPB_cmp() @@ -107,7 +112,7 @@ namespace map { void HashMapHdrTest::Split_RCU_GPB_cmpmix() { // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_GPB_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; test_rcu< map_type >(); // option-based version @@ -129,6 +134,31 @@ namespace map { test_rcu< opt_map >(); } + void HashMapHdrTest::Split_RCU_GPB_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cds::opt::stat< cc::split_list::stat<>> + ,cc::split_list::ordered_list_traits< + cc::michael_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_rcu_gpi.cpp b/tests/test-hdr/map/hdr_splitlist_map_rcu_gpi.cpp index 239073ac..0a69b116 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_rcu_gpi.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_rcu_gpi.cpp @@ -10,7 +10,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::general_instant<> > rcu_type; - struct RCU_GPI_cmp_traits: public cc::split_list::type_traits + struct RCU_GPI_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -18,13 +18,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_GPI_less_traits: public cc::split_list::type_traits + struct RCU_GPI_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -32,24 +32,30 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_GPI_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; + } void HashMapHdrTest::Split_RCU_GPI_cmp() @@ -107,7 +113,7 @@ namespace map { void HashMapHdrTest::Split_RCU_GPI_cmpmix() { // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_GPI_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; test_rcu< map_type >(); // option-based version @@ -129,6 +135,31 @@ namespace map { test_rcu< opt_map >(); } + void HashMapHdrTest::Split_RCU_GPI_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cds::opt::stat< cc::split_list::stat<>> + ,cc::split_list::ordered_list_traits< + cc::michael_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_rcu_gpt.cpp b/tests/test-hdr/map/hdr_splitlist_map_rcu_gpt.cpp index 0272e028..d83b95b2 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_rcu_gpt.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_rcu_gpt.cpp @@ -10,7 +10,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::general_threaded<> > rcu_type; - struct RCU_GPT_cmp_traits: public cc::split_list::type_traits + struct RCU_GPT_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -18,13 +18,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_GPT_less_traits: public cc::split_list::type_traits + struct RCU_GPT_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -32,24 +32,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_GPT_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } void HashMapHdrTest::Split_RCU_GPT_cmp() @@ -107,7 +112,7 @@ namespace map { void HashMapHdrTest::Split_RCU_GPT_cmpmix() { // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_GPT_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; test_rcu< map_type >(); // option-based version @@ -129,6 +134,31 @@ namespace map { test_rcu< opt_map >(); } + void HashMapHdrTest::Split_RCU_GPT_cmpmix_stat() + { + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,cc::opt::hash< hash_int > + ,cc::opt::item_counter< simple_item_counter > + ,cds::opt::stat< cc::split_list::stat<>> + ,cc::split_list::ordered_list_traits< + cc::michael_list::make_traits< + cc::opt::less< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); + } } // namespace map diff --git a/tests/test-hdr/map/hdr_splitlist_map_rcu_shb.cpp b/tests/test-hdr/map/hdr_splitlist_map_rcu_shb.cpp index 51dbe245..a74538fa 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_rcu_shb.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_rcu_shb.cpp @@ -11,7 +11,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::signal_buffered<> > rcu_type; - struct RCU_SHB_cmp_traits: public cc::split_list::type_traits + struct RCU_SHB_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -19,13 +19,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_SHB_less_traits: public cc::split_list::type_traits + struct RCU_SHB_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -33,24 +33,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_SHB_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } #endif @@ -114,7 +119,34 @@ namespace map { { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_SHB_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,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< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); +#endif + } + + void HashMapHdrTest::Split_RCU_SHB_cmpmix_stat() + { +#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; test_rcu< map_type >(); // option-based version @@ -125,6 +157,7 @@ namespace map { cc::split_list::ordered_list ,cc::opt::hash< hash_int > ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat> ,cc::split_list::ordered_list_traits< cc::michael_list::make_traits< cc::opt::less< std::less > diff --git a/tests/test-hdr/map/hdr_splitlist_map_rcu_sht.cpp b/tests/test-hdr/map/hdr_splitlist_map_rcu_sht.cpp index 67656629..af2973d4 100644 --- a/tests/test-hdr/map/hdr_splitlist_map_rcu_sht.cpp +++ b/tests/test-hdr/map/hdr_splitlist_map_rcu_sht.cpp @@ -11,7 +11,7 @@ namespace map { namespace { typedef cds::urcu::gc< cds::urcu::signal_threaded<> > rcu_type; - struct RCU_SHT_cmp_traits: public cc::split_list::type_traits + struct RCU_SHT_cmp_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -19,13 +19,13 @@ namespace map { typedef cc::opt::v::relaxed_ordering memory_model; enum { dynamic_bucket_table = false }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; }; }; - struct RCU_SHT_less_traits: public cc::split_list::type_traits + struct RCU_SHT_less_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; @@ -33,24 +33,29 @@ namespace map { typedef cc::opt::v::sequential_consistent memory_model; enum { dynamic_bucket_table = true }; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::less less; }; }; - struct RCU_SHT_cmpmix_traits: public cc::split_list::type_traits + struct RCU_cmpmix_traits: public cc::split_list::traits { typedef cc::michael_list_tag ordered_list; typedef HashMapHdrTest::hash_int hash; typedef HashMapHdrTest::simple_item_counter item_counter; - struct ordered_list_traits: public cc::michael_list::type_traits + struct ordered_list_traits: public cc::michael_list::traits { typedef HashMapHdrTest::cmp compare; typedef std::less less; }; }; + + struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits + { + typedef cc::split_list::stat<> stat; + }; } #endif @@ -114,7 +119,34 @@ namespace map { { #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED // traits-based version - typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_SHT_cmpmix_traits > map_type; + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_traits > map_type; + test_rcu< map_type >(); + + // option-based version + typedef cc::SplitListMap< rcu_type, + key_type, + value_type, + cc::split_list::make_traits< + cc::split_list::ordered_list + ,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< std::less > + ,cc::opt::compare< cmp > + >::type + > + >::type + > opt_map; + test_rcu< opt_map >(); +#endif + } + + void HashMapHdrTest::Split_RCU_SHT_cmpmix_stat() + { +#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED + // traits-based version + typedef cc::SplitListMap< rcu_type, key_type, value_type, RCU_cmpmix_stat_traits > map_type; test_rcu< map_type >(); // option-based version @@ -125,6 +157,7 @@ namespace map { cc::split_list::ordered_list ,cc::opt::hash< hash_int > ,cc::opt::item_counter< simple_item_counter > + ,cc::opt::stat> ,cc::split_list::ordered_list_traits< cc::michael_list::make_traits< cc::opt::less< std::less > -- 2.34.1