From cb88c366b9a667e9214834ac842cf899cd61765d Mon Sep 17 00:00:00 2001 From: khizmax Date: Mon, 23 May 2016 23:37:05 +0300 Subject: [PATCH] Migrated map-insdel-func stress test to gtest --- projects/Win/vc14/cds.sln | 15 + .../Win/vc14/stress-map-insdel-func.vcxproj | 272 +++++++++ .../stress-map-insdel-func.vcxproj.filters | 57 ++ projects/Win/vc14/unit-map-insdel.vcxproj | 10 - .../Win/vc14/unit-map-insdel.vcxproj.filters | 33 -- projects/source.unit.map.mk | 9 - test/stress/data/test-debug.conf | 4 +- test/stress/data/test-express.conf | 2 +- test/stress/data/test.conf | 8 +- test/stress/map/CMakeLists.txt | 2 + test/stress/map/delodd/map_delodd.h | 3 - test/stress/map/insdel_func/CMakeLists.txt | 30 + .../map/insdel_func/map_insdel_func.cpp | 126 ++++ test/stress/map/insdel_func/map_insdel_func.h | 545 ++++++++++++++++++ .../map_insdel_func_bronsonavltree.cpp | 38 ++ .../insdel_func/map_insdel_func_cuckoo.cpp | 38 ++ .../insdel_func/map_insdel_func_ellentree.cpp | 38 ++ .../map_insdel_func_feldman_hashset.cpp | 38 ++ .../insdel_func/map_insdel_func_michael.cpp | 38 ++ .../map/insdel_func/map_insdel_func_skip.cpp | 38 ++ .../map/insdel_func/map_insdel_func_split.cpp | 38 ++ .../insdel_func/map_insdel_func_striped.cpp | 38 ++ 22 files changed, 1358 insertions(+), 62 deletions(-) create mode 100644 projects/Win/vc14/stress-map-insdel-func.vcxproj create mode 100644 projects/Win/vc14/stress-map-insdel-func.vcxproj.filters create mode 100644 test/stress/map/insdel_func/CMakeLists.txt create mode 100644 test/stress/map/insdel_func/map_insdel_func.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func.h create mode 100644 test/stress/map/insdel_func/map_insdel_func_bronsonavltree.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func_cuckoo.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func_ellentree.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func_feldman_hashset.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func_michael.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func_skip.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func_split.cpp create mode 100644 test/stress/map/insdel_func/map_insdel_func_striped.cpp diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln index 51c0350f..e4b10067 100644 --- a/projects/Win/vc14/cds.sln +++ b/projects/Win/vc14/cds.sln @@ -227,6 +227,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-map-find_int", "stre EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-map-find_string", "stress-map-find_string.vcxproj", "{C127CD80-E8A7-47E4-B7EC-1709D2188982}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-map-insdel-func", "stress-map-insdel-func.vcxproj", "{34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -597,6 +599,18 @@ Global {C127CD80-E8A7-47E4-B7EC-1709D2188982}.Release|Win32.Build.0 = Release|Win32 {C127CD80-E8A7-47E4-B7EC-1709D2188982}.Release|x64.ActiveCfg = Release|x64 {C127CD80-E8A7-47E4-B7EC-1709D2188982}.Release|x64.Build.0 = Release|x64 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Debug|Win32.Build.0 = Debug|Win32 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Debug|x64.ActiveCfg = Debug|x64 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Debug|x64.Build.0 = Debug|x64 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Release|Win32.ActiveCfg = Release|Win32 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Release|Win32.Build.0 = Release|Win32 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Release|x64.ActiveCfg = Release|x64 + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -636,6 +650,7 @@ Global {DD432BE7-0CA8-47C6-B861-943A036C18EF} = {7D3EE35B-185D-40B5-88C2-7F9933426978} {3F36B97B-8028-4335-ADDD-20B6B81F87AF} = {7D3EE35B-185D-40B5-88C2-7F9933426978} {C127CD80-E8A7-47E4-B7EC-1709D2188982} = {7D3EE35B-185D-40B5-88C2-7F9933426978} + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4} = {7D3EE35B-185D-40B5-88C2-7F9933426978} EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} diff --git a/projects/Win/vc14/stress-map-insdel-func.vcxproj b/projects/Win/vc14/stress-map-insdel-func.vcxproj new file mode 100644 index 00000000..cc82ac02 --- /dev/null +++ b/projects/Win/vc14/stress-map-insdel-func.vcxproj @@ -0,0 +1,272 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + + + + + + + + {34FA4110-F17B-4AD0-A4C9-C91B92AD06E4} + Win32Proj + stress_map_insdel_func + 8.1 + stress-map-insdel-func + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;stress-framework_d.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;stress-framework_d.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;stress-framework_d.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;stress-framework_d.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;stress-framework.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_USE_URCU;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(SolutionDir)..\..\..\test\stress\map;$(SolutionDir)..\..\..\test\stress\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;stress-framework.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/stress-map-insdel-func.vcxproj.filters b/projects/Win/vc14/stress-map-insdel-func.vcxproj.filters new file mode 100644 index 00000000..05f85641 --- /dev/null +++ b/projects/Win/vc14/stress-map-insdel-func.vcxproj.filters @@ -0,0 +1,57 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/unit-map-insdel.vcxproj b/projects/Win/vc14/unit-map-insdel.vcxproj index 7e920bb6..859fd33d 100644 --- a/projects/Win/vc14/unit-map-insdel.vcxproj +++ b/projects/Win/vc14/unit-map-insdel.vcxproj @@ -27,15 +27,6 @@ - - - - - - - - - @@ -58,7 +49,6 @@ - diff --git a/projects/Win/vc14/unit-map-insdel.vcxproj.filters b/projects/Win/vc14/unit-map-insdel.vcxproj.filters index ef09d099..1249bbb4 100644 --- a/projects/Win/vc14/unit-map-insdel.vcxproj.filters +++ b/projects/Win/vc14/unit-map-insdel.vcxproj.filters @@ -1,30 +1,6 @@  - - map_insdel_func - - - map_insdel_func - - - map_insdel_func - - - map_insdel_func - - - map_insdel_func - - - map_insdel_func - - - map_insdel_func - - - map_insdel_func - map_insdel_int @@ -82,17 +58,11 @@ map_insdel_int - - map_insdel_func - map_insdel_string - - {7cb9e730-e4e0-4648-96f1-e1dbf119756e} - {55aed984-fed9-4007-9ad3-59bec69befe8} @@ -101,9 +71,6 @@ - - map_insdel_func - map_insdel_int diff --git a/projects/source.unit.map.mk b/projects/source.unit.map.mk index a54fbde3..86e9f921 100644 --- a/projects/source.unit.map.mk +++ b/projects/source.unit.map.mk @@ -10,15 +10,6 @@ CDSUNIT_MAP_SOURCES := \ tests/unit/map2/map_insfind_int_split.cpp \ tests/unit/map2/map_insfind_int_striped.cpp \ tests/unit/map2/map_insfind_int_std.cpp \ - tests/unit/map2/map_insdel_func.cpp \ - tests/unit/map2/map_insdel_func_bronsonavltree.cpp \ - tests/unit/map2/map_insdel_func_cuckoo.cpp \ - tests/unit/map2/map_insdel_func_ellentree.cpp \ - tests/unit/map2/map_insdel_func_michael.cpp \ - tests/unit/map2/map_insdel_func_feldmanhashmap.cpp \ - tests/unit/map2/map_insdel_func_skip.cpp \ - tests/unit/map2/map_insdel_func_split.cpp \ - tests/unit/map2/map_insdel_func_striped.cpp \ tests/unit/map2/map_insdel_int.cpp \ tests/unit/map2/map_insdel_int_bronsonavltree.cpp \ tests/unit/map2/map_insdel_int_cuckoo.cpp \ diff --git a/test/stress/data/test-debug.conf b/test/stress/data/test-debug.conf index edd7e37e..1e6bf963 100644 --- a/test/stress/data/test-debug.conf +++ b/test/stress/data/test-debug.conf @@ -221,9 +221,9 @@ InsertThreadCount=4 DeleteThreadCount=4 UpdateThreadCount=4 ThreadPassCount=8 -MapSize=5000 +MapSize=10000 MaxLoadFactor=4 -PrintGCStateFlag=1 + # *** Cuckoo map properties CuckooInitialSize=256 CuckooProbesetSize=8 diff --git a/test/stress/data/test-express.conf b/test/stress/data/test-express.conf index 25ec4450..1ff33fda 100644 --- a/test/stress/data/test-express.conf +++ b/test/stress/data/test-express.conf @@ -217,7 +217,7 @@ UpdateThreadCount=4 ThreadPassCount=4 MapSize=100000 MaxLoadFactor=4 -PrintGCStateFlag=1 + # *** Cuckoo map properties CuckooInitialSize=1024 CuckooProbesetSize=16 diff --git a/test/stress/data/test.conf b/test/stress/data/test.conf index 6e61bad3..c46970c5 100644 --- a/test/stress/data/test.conf +++ b/test/stress/data/test.conf @@ -192,7 +192,7 @@ CuckooProbesetThreshold=0 FeldmanMapHeadBits=10 FeldmanMapArrayBits=4 -[Map_InsDel_int] +[map_insdel_int] InsertThreadCount=4 DeleteThreadCount=4 ThreadPassCount=2 @@ -213,10 +213,10 @@ FeldmanMapArrayBits=4 InsertThreadCount=4 DeleteThreadCount=4 UpdateThreadCount=4 -ThreadPassCount=2 -MapSize=1000000 +ThreadPassCount=10 +MapSize=100000 MaxLoadFactor=4 -PrintGCStateFlag=1 + # *** Cuckoo map properties CuckooInitialSize=1024 CuckooProbesetSize=16 diff --git a/test/stress/map/CMakeLists.txt b/test/stress/map/CMakeLists.txt index b1e9c1c6..7d14920e 100644 --- a/test/stress/map/CMakeLists.txt +++ b/test/stress/map/CMakeLists.txt @@ -4,6 +4,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCDSUNIT_USE_URCU") add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/delodd) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/find_int) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/find_string) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_func) #add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_find) #add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_func) #add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/insdel_string) @@ -13,4 +14,5 @@ add_custom_target( stress-map stress-map-delodd stress-map-find-int stress-map-find-string + stress-map-insdel-func ) diff --git a/test/stress/map/delodd/map_delodd.h b/test/stress/map/delodd/map_delodd.h index 9d0a96b6..003c15dd 100644 --- a/test/stress/map/delodd/map_delodd.h +++ b/test/stress/map/delodd/map_delodd.h @@ -395,9 +395,6 @@ namespace map { { Map& rMap = m_Map; - m_nDeleteSuccess = - m_nDeleteFailed = 0; - typename Map::guarded_ptr gp; Map_DelOdd& fixture = pool().template fixture(); size_t const nInsThreadCount = s_nInsThreadCount; diff --git a/test/stress/map/insdel_func/CMakeLists.txt b/test/stress/map/insdel_func/CMakeLists.txt new file mode 100644 index 00000000..f6a4e483 --- /dev/null +++ b/test/stress/map/insdel_func/CMakeLists.txt @@ -0,0 +1,30 @@ +set(PACKAGE_NAME stress-map-insdel-func) + +set(CDSSTRESS_MAP_INSDEL_FUNC_SOURCES + ../../main.cpp + map_insdel_func.cpp + map_insdel_func_bronsonavltree.cpp + map_insdel_func_cuckoo.cpp + map_insdel_func_ellentree.cpp + map_insdel_func_feldman_hashset.cpp + map_insdel_func_michael.cpp + map_insdel_func_skip.cpp + map_insdel_func_split.cpp + map_insdel_func_striped.cpp +) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. +) + +add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_INSDEL_FUNC_SOURCES} $) +target_link_libraries(${PACKAGE_NAME} + ${CDS_SHARED_LIBRARY} + ${GTEST_LIBRARY} + ${Boost_THREAD_LIBRARY} + ${Boost_SYSTEM_LIBRARY} + ${CMAKE_THREAD_LIBS_INIT} +) + +add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) \ No newline at end of file diff --git a/test/stress/map/insdel_func/map_insdel_func.cpp b/test/stress/map/insdel_func/map_insdel_func.cpp new file mode 100644 index 00000000..791adbcc --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func.cpp @@ -0,0 +1,126 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" + +namespace map { + + size_t Map_InsDel_func::s_nMapSize = 1000000; // map size + size_t Map_InsDel_func::s_nInsertThreadCount = 4; // count of insertion thread + size_t Map_InsDel_func::s_nDeleteThreadCount = 4; // count of deletion thread + size_t Map_InsDel_func::s_nUpdateThreadCount = 4; // count of ensure thread + size_t Map_InsDel_func::s_nThreadPassCount = 4; // pass count for each thread + size_t Map_InsDel_func::s_nMaxLoadFactor = 8; // maximum load factor + + size_t Map_InsDel_func::s_nCuckooInitialSize = 1024;// initial size for CuckooSet + size_t Map_InsDel_func::s_nCuckooProbesetSize = 16; // CuckooSet probeset size (only for list-based probeset) + size_t Map_InsDel_func::s_nCuckooProbesetThreshold = 0; // CUckooSet probeset threshold (0 - use default) + + size_t Map_InsDel_func::s_nFeldmanMap_HeadBits = 10; + size_t Map_InsDel_func::s_nFeldmanMap_ArrayBits = 4; + + size_t Map_InsDel_func::s_nLoadFactor = 1; + Map_InsDel_func::key_array Map_InsDel_func::s_arrKeys; + + void Map_InsDel_func::SetUpTestCase() + { + cds_test::config const& cfg = get_config( "map_insdel_func" ); + + s_nMapSize = cfg.get_size_t( "MapSize", s_nMapSize ); + if ( s_nMapSize < 1000 ) + s_nMapSize = 1000; + + s_nInsertThreadCount = cfg.get_size_t( "InsertThreadCount", s_nInsertThreadCount ); + if ( s_nInsertThreadCount == 0 ) + s_nInsertThreadCount = 2; + + s_nDeleteThreadCount = cfg.get_size_t( "DeleteThreadCount", s_nDeleteThreadCount ); + if ( s_nDeleteThreadCount == 0 ) + s_nDeleteThreadCount = 2; + + s_nUpdateThreadCount = cfg.get_size_t( "UpdateThreadCount", s_nUpdateThreadCount ); + if ( s_nUpdateThreadCount == 0 ) + s_nUpdateThreadCount = 2; + + s_nThreadPassCount = cfg.get_size_t( "ThreadPassCount", s_nThreadPassCount ); + if ( s_nThreadPassCount == 0 ) + s_nThreadPassCount = 4; + + s_nMaxLoadFactor = cfg.get_size_t( "MaxLoadFactor", s_nMaxLoadFactor ); + if ( s_nMaxLoadFactor == 0 ) + s_nMaxLoadFactor = 1; + + s_nCuckooInitialSize = cfg.get_size_t( "CuckooInitialSize", s_nCuckooInitialSize ); + if ( s_nCuckooInitialSize < 256 ) + s_nCuckooInitialSize = 256; + + s_nCuckooProbesetSize = cfg.get_size_t( "CuckooProbesetSize", s_nCuckooProbesetSize ); + if ( s_nCuckooProbesetSize < 8 ) + s_nCuckooProbesetSize = 8; + + s_nCuckooProbesetThreshold = cfg.get_size_t( "CuckooProbesetThreshold", s_nCuckooProbesetThreshold ); + + s_nFeldmanMap_HeadBits = cfg.get_size_t( "FeldmanMapHeadBits", s_nFeldmanMap_HeadBits ); + if ( s_nFeldmanMap_HeadBits == 0 ) + s_nFeldmanMap_HeadBits = 2; + + s_nFeldmanMap_ArrayBits = cfg.get_size_t( "FeldmanMapArrayBits", s_nFeldmanMap_ArrayBits ); + if ( s_nFeldmanMap_ArrayBits == 0 ) + s_nFeldmanMap_ArrayBits = 2; + + s_arrKeys.clear(); + s_arrKeys.reserve( s_nMapSize ); + for ( size_t i = 0; i < s_nMapSize; ++i ) + s_arrKeys.push_back( i ); + shuffle( s_arrKeys.begin(), s_arrKeys.end() ); + } + + void Map_InsDel_func::TearDownTestCase() + { + s_arrKeys.clear(); + } + + std::vector Map_InsDel_func_LF::get_load_factors() + { + cds_test::config const& cfg = get_config( "map_insdel_func" ); + + s_nMaxLoadFactor = cfg.get_size_t( "MaxLoadFactor", s_nMaxLoadFactor ); + if ( s_nMaxLoadFactor == 0 ) + s_nMaxLoadFactor = 1; + + std::vector lf; + for ( size_t n = 1; n <= s_nMaxLoadFactor; n *= 2 ) + lf.push_back( n ); + + return lf; + } + + INSTANTIATE_TEST_CASE_P( a, Map_InsDel_func_LF, ::testing::ValuesIn( Map_InsDel_func_LF::get_load_factors())); +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func.h b/test/stress/map/insdel_func/map_insdel_func.h new file mode 100644 index 00000000..b56f5fed --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func.h @@ -0,0 +1,545 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_type.h" + +namespace map { + + class Map_InsDel_func: public cds_test::stress_fixture + { + public: + static size_t s_nMapSize; // map size + static size_t s_nInsertThreadCount; // count of insertion thread + static size_t s_nDeleteThreadCount; // count of deletion thread + static size_t s_nUpdateThreadCount; // count of updating thread + static size_t s_nThreadPassCount; // pass count for each thread + static size_t s_nMaxLoadFactor; // maximum load factor + + static size_t s_nCuckooInitialSize; // initial size for CuckooMap + static size_t s_nCuckooProbesetSize; // CuckooMap probeset size (only for list-based probeset) + static size_t s_nCuckooProbesetThreshold; // CuckooMap probeset threshold (o - use default) + + static size_t s_nFeldmanMap_HeadBits; + static size_t s_nFeldmanMap_ArrayBits; + + static size_t s_nLoadFactor; // current load factor + + static void SetUpTestCase(); + static void TearDownTestCase(); + + typedef size_t key_type; + struct value_type { + size_t nKey; + size_t nData; + size_t nUpdateCall; + atomics::atomic bInitialized; + cds::OS::ThreadId threadId; // inserter thread id + + typedef cds::sync::spin_lock< cds::backoff::pause > lock_type; + mutable lock_type m_access; + + value_type() + : nKey(0) + , nData(0) + , nUpdateCall(0) + , bInitialized( false ) + , threadId( cds::OS::get_current_thread_id()) + {} + + value_type( value_type const& s ) + : nKey(s.nKey) + , nData(s.nData) + , nUpdateCall( s.nUpdateCall ) + , bInitialized( s.bInitialized.load(atomics::memory_order_relaxed)) + , threadId( cds::OS::get_current_thread_id()) + {} + + // boost::container::flat_map requires operator = + value_type& operator=( value_type const& v ) + { + nKey = v.nKey; + nData = v.nData; + nUpdateCall = v.nUpdateCall; + bInitialized.store(v.bInitialized.load(atomics::memory_order_relaxed), atomics::memory_order_relaxed); + + return *this; + } + }; + + typedef std::vector key_array; + static key_array s_arrKeys; + + protected: + enum { + insert_thread, + delete_thread, + update_thread + }; + + template + class Inserter: public cds_test::thread + { + typedef cds_test::thread base_class; + Map& m_Map; + + struct insert_functor { + size_t nTestFunctorRef; + + insert_functor() + : nTestFunctorRef(0) + {} + + template + void operator()( Pair& val ) + { + operator()( val.first, val.second ); + } + + template + void operator()( Key const& key, Val& v ) + { + std::unique_lock< typename value_type::lock_type> ac( v.m_access ); + + v.nKey = key; + v.nData = key * 8; + + ++nTestFunctorRef; + v.bInitialized.store( true, atomics::memory_order_relaxed); + } + }; + + public: + size_t m_nInsertSuccess = 0; + size_t m_nInsertFailed = 0; + + size_t m_nTestFunctorRef = 0; + + public: + Inserter( cds_test::thread_pool& pool, Map& map ) + : base_class( pool, insert_thread ) + , m_Map( map ) + {} + + Inserter( Inserter& src ) + : base_class( src ) + , m_Map( src.m_Map ) + {} + + virtual thread * clone() + { + return new Inserter( *this ); + } + + virtual void test() + { + Map& rMap = m_Map; + + // func is passed by reference + insert_functor func; + size_t const nPassCount = s_nThreadPassCount; + + if ( id() & 1 ) { + for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) { + for ( key_array::const_iterator it = s_arrKeys.begin(), itEnd = s_arrKeys.end(); it != itEnd; ++it ) { + if ( rMap.insert_with( *it, std::ref(func))) + ++m_nInsertSuccess; + else + ++m_nInsertFailed; + } + } + } + else { + for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) { + for ( key_array::const_reverse_iterator it = s_arrKeys.rbegin(), itEnd = s_arrKeys.rend(); it != itEnd; ++it ) { + if ( rMap.insert_with( *it, std::ref(func))) + ++m_nInsertSuccess; + else + ++m_nInsertFailed; + } + } + } + + m_nTestFunctorRef = func.nTestFunctorRef; + } + }; + + template + class Updater: public cds_test::thread + { + typedef cds_test::thread base_class; + Map& m_Map; + + struct update_functor { + size_t nCreated = 0; + size_t nModified = 0; + + update_functor() = default; + + template + void operator()( bool /*bNew*/, Key const& key, Val& v ) + { + std::unique_lock ac( v.m_access ); + if ( !v.bInitialized.load( atomics::memory_order_acquire )) { + ++nCreated; + v.nKey = key; + v.nData = key * 8; + v.bInitialized.store( true, atomics::memory_order_relaxed); + } + else { + ++v.nUpdateCall; + ++nModified; + } + } + + template + void operator()( bool bNew, Pair& val ) + { + operator()( bNew, val.first, val.second ); + } + + // For FeldmanHashMap + template + void operator()( Val& cur, Val * old ) + { + if ( old ) { + // If a key exists, FeldmanHashMap creates a new node too + // We should manually copy important values from old to cur + std::unique_lock ac( cur.second.m_access ); + cur.second.nKey = cur.first; + cur.second.nData = cur.first * 8; + cur.second.bInitialized.store( true, atomics::memory_order_release ); + } + operator()( old == nullptr, cur.first, cur.second ); + } + + private: + update_functor(const update_functor& ) = delete; + }; + + public: + size_t m_nUpdateFailed = 0; + size_t m_nUpdateCreated = 0; + size_t m_nUpdateExisted = 0; + size_t m_nFunctorCreated = 0; + size_t m_nFunctorModified = 0; + + public: + Updater( cds_test::thread_pool& pool, Map& map ) + : base_class( pool, update_thread ) + , m_Map( map ) + {} + + Updater( Updater& src ) + : base_class( src ) + , m_Map( src.m_Map ) + {} + + virtual thread * clone() + { + return new Updater( *this ); + } + + virtual void test() + { + Map& rMap = m_Map; + + update_functor func; + size_t const nPassCount = s_nThreadPassCount; + + if ( id() & 1 ) { + for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) { + for ( key_array::const_iterator it = s_arrKeys.begin(), itEnd = s_arrKeys.end(); it != itEnd; ++it ) { + std::pair ret = rMap.update( *it, std::ref( func )); + if ( ret.first ) { + if ( ret.second ) + ++m_nUpdateCreated; + else + ++m_nUpdateExisted; + } + else + ++m_nUpdateFailed; + } + } + } + else { + for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) { + for ( key_array::const_reverse_iterator it = s_arrKeys.rbegin(), itEnd = s_arrKeys.rend(); it != itEnd; ++it ) { + std::pair ret = rMap.update( *it, std::ref( func )); + if ( ret.first ) { + if ( ret.second ) + ++m_nUpdateCreated; + else + ++m_nUpdateExisted; + } + else + ++m_nUpdateFailed; + } + } + } + + m_nFunctorCreated = func.nCreated; + m_nFunctorModified = func.nModified; + } + }; + + template + class Deleter: public cds_test::thread + { + Map& m_Map; + typedef cds_test::thread base_class; + typedef typename Map::mapped_type value_type; + + struct value_container + { + size_t nKeyExpected; + + size_t nSuccessItem; + size_t nFailedItem; + + value_container() + : nSuccessItem(0) + , nFailedItem(0) + {} + }; + + struct erase_functor { + value_container m_cnt; + + template + void operator()( Key const& /*key*/, Val& v ) + { + while ( true ) { + if ( v.bInitialized.load( atomics::memory_order_relaxed )) { + std::unique_lock< typename value_type::lock_type> ac( v.m_access ); + + if ( m_cnt.nKeyExpected == v.nKey && m_cnt.nKeyExpected * 8 == v.nData ) + ++m_cnt.nSuccessItem; + else + ++m_cnt.nFailedItem; + v.nData++; + v.nKey = 0; + break; + } + else + cds::backoff::yield()(); + } + } + + template + void operator ()( Pair& item ) + { + operator()( item.first, item.second ); + } + }; + + public: + size_t m_nDeleteSuccess = 0; + size_t m_nDeleteFailed = 0; + size_t m_nValueSuccess = 0; + size_t m_nValueFailed = 0; + + public: + Deleter( cds_test::thread_pool& pool, Map& map ) + : base_class( pool, delete_thread ) + , m_Map( map ) + {} + + Deleter( Deleter& src ) + : base_class( src ) + , m_Map( src.m_Map ) + {} + + virtual thread * clone() + { + return new Deleter( *this ); + } + + virtual void test() + { + Map& rMap = m_Map; + + erase_functor func; + size_t const nPassCount = s_nThreadPassCount; + + if ( id() & 1 ) { + for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) { + for ( key_array::const_iterator it = s_arrKeys.cbegin(), itEnd = s_arrKeys.cend(); it != itEnd; ++it ) { + func.m_cnt.nKeyExpected = *it; + if ( rMap.erase( *it, std::ref(func))) + ++m_nDeleteSuccess; + else + ++m_nDeleteFailed; + } + } + } + else { + for ( size_t nPass = 0; nPass < nPassCount; ++nPass ) { + for ( key_array::const_reverse_iterator it = s_arrKeys.crbegin(), itEnd = s_arrKeys.crend(); it != itEnd; ++it ) { + func.m_cnt.nKeyExpected = *it; + if ( rMap.erase( *it, std::ref(func))) + ++m_nDeleteSuccess; + else + ++m_nDeleteFailed; + } + } + } + + m_nValueSuccess = func.m_cnt.nSuccessItem; + m_nValueFailed = func.m_cnt.nFailedItem; + } + }; + + protected: + + template + void do_test( Map& testMap ) + { + typedef Inserter inserter; + typedef Deleter deleter; + typedef Updater updater; + + cds_test::thread_pool& pool = get_pool(); + pool.add( new inserter( pool, testMap ), s_nInsertThreadCount ); + pool.add( new deleter( pool, testMap ), s_nDeleteThreadCount ); + pool.add( new updater( pool, testMap ), s_nUpdateThreadCount ); + + propout() << std::make_pair( "insert_thread_count", s_nInsertThreadCount ) + << std::make_pair( "delete_thread_count", s_nDeleteThreadCount ) + << std::make_pair( "update_thread_count", s_nUpdateThreadCount ) + << std::make_pair( "pass_count", s_nThreadPassCount ) + << std::make_pair( "map_size", s_nMapSize ); + + std::chrono::milliseconds duration = pool.run(); + + propout() << std::make_pair( "duration", duration ); + + size_t nInsertSuccess = 0; + size_t nInsertFailed = 0; + size_t nDeleteSuccess = 0; + size_t nDeleteFailed = 0; + size_t nDelValueSuccess = 0; + size_t nDelValueFailed = 0; + size_t nUpdateFailed = 0; + size_t nUpdateCreated = 0; + size_t nUpdateModified = 0; + size_t nEnsFuncCreated = 0; + size_t nEnsFuncModified = 0; + size_t nInsFuncCalled = 0; + + for ( size_t i = 0; i < pool.size(); ++i ) { + cds_test::thread& thr = pool.get( i ); + switch ( thr.type() ) { + case insert_thread: + { + inserter& t = static_cast( thr ); + nInsertSuccess += t.m_nInsertSuccess; + nInsertFailed += t.m_nInsertFailed; + nInsFuncCalled += t.m_nTestFunctorRef; + } + break; + case delete_thread: + { + deleter& t = static_cast(thr); + nDeleteSuccess += t.m_nDeleteSuccess; + nDeleteFailed += t.m_nDeleteFailed; + nDelValueSuccess += t.m_nValueSuccess; + nDelValueFailed += t.m_nValueFailed; + } + break; + case update_thread: + { + updater& t = static_cast(thr); + nUpdateCreated += t.m_nUpdateCreated; + nUpdateModified += t.m_nUpdateExisted; + nUpdateFailed += t.m_nUpdateFailed; + nEnsFuncCreated += t.m_nFunctorCreated; + nEnsFuncModified += t.m_nFunctorModified; + } + break; + default: + assert( false ); + } + } + + propout() + << std::make_pair( "insert_success", nInsertSuccess ) + << std::make_pair( "insert_failed", nInsertFailed ) + << std::make_pair( "delete_success", nDeleteSuccess ) + << std::make_pair( "delete_failed", nDeleteFailed ) + << std::make_pair( "update_success", nUpdateCreated + nUpdateModified ) + << std::make_pair( "update_failed", nUpdateFailed ) + << std::make_pair( "update_functor_create", nEnsFuncCreated ) + << std::make_pair( "update_functor_modify", nEnsFuncModified ) + << std::make_pair( "finish_map_size", testMap.size() ); + + EXPECT_EQ( nDelValueFailed, 0 ); + EXPECT_EQ( nDelValueSuccess, nDeleteSuccess ); + EXPECT_EQ( nUpdateFailed, 0 ); + EXPECT_EQ( nUpdateCreated + nUpdateModified, nEnsFuncCreated + nEnsFuncModified ); + + // nInsFuncCalled is call count of insert functor + EXPECT_EQ( nInsFuncCalled, nInsertSuccess ); + + check_before_cleanup( testMap ); + + for ( size_t nItem = 0; nItem < s_nMapSize; ++nItem ) + testMap.erase( nItem ); + + EXPECT_TRUE( testMap.empty()); + + additional_check( testMap ); + print_stat( propout(), testMap ); + additional_cleanup( testMap ); + } + + template + void run_test() + { + Map testMap( *this ); + do_test( testMap ); + } + }; + + class Map_InsDel_func_LF: public Map_InsDel_func + , public ::testing::WithParamInterface + { + public: + template + void run_test() + { + s_nLoadFactor = GetParam(); + propout() << std::make_pair( "load_factor", s_nLoadFactor ); + Map_InsDel_func::run_test(); + } + + static std::vector get_load_factors(); + }; + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_bronsonavltree.cpp b/test/stress/map/insdel_func/map_insdel_func_bronsonavltree.cpp new file mode 100644 index 00000000..8d52d8a1 --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_bronsonavltree.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_bronson_avltree.h" + +namespace map { + + CDSSTRESS_BronsonAVLTreeMap( Map_InsDel_func, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_cuckoo.cpp b/test/stress/map/insdel_func/map_insdel_func_cuckoo.cpp new file mode 100644 index 00000000..535e180b --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_cuckoo.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_cuckoo.h" + +namespace map { + + CDSSTRESS_CuckooMap( Map_InsDel_func, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_ellentree.cpp b/test/stress/map/insdel_func/map_insdel_func_ellentree.cpp new file mode 100644 index 00000000..aa0d15cf --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_ellentree.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_ellen_bintree.h" + +namespace map { + + CDSSTRESS_EllenBinTreeMap( Map_InsDel_func, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_feldman_hashset.cpp b/test/stress/map/insdel_func/map_insdel_func_feldman_hashset.cpp new file mode 100644 index 00000000..d4ef1d10 --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_feldman_hashset.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_feldman_hashmap.h" + +namespace map { + + CDSSTRESS_FeldmanHashMap_fixed( Map_InsDel_func, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_michael.cpp b/test/stress/map/insdel_func/map_insdel_func_michael.cpp new file mode 100644 index 00000000..9ad39bad --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_michael.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_michael.h" + +namespace map { + + CDSSTRESS_MichaelMap( Map_InsDel_func_LF, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_skip.cpp b/test/stress/map/insdel_func/map_insdel_func_skip.cpp new file mode 100644 index 00000000..bd949049 --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_skip.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_skip_list.h" + +namespace map { + + CDSSTRESS_SkipListMap( Map_InsDel_func, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_split.cpp b/test/stress/map/insdel_func/map_insdel_func_split.cpp new file mode 100644 index 00000000..e6cd74d1 --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_split.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_split_list.h" + +namespace map { + + CDSSTRESS_SplitListMap( Map_InsDel_func_LF, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map diff --git a/test/stress/map/insdel_func/map_insdel_func_striped.cpp b/test/stress/map/insdel_func/map_insdel_func_striped.cpp new file mode 100644 index 00000000..f04c5502 --- /dev/null +++ b/test/stress/map/insdel_func/map_insdel_func_striped.cpp @@ -0,0 +1,38 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "map_insdel_func.h" +#include "map_type_striped.h" + +namespace map { + + CDSSTRESS_StripedMap( Map_InsDel_func_LF, run_test, size_t, Map_InsDel_func::value_type ) + +} // namespace map -- 2.34.1