Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP]Hopscotch concurrent map #106

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

[WIP]Hopscotch concurrent map #106

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e8590df
hopscotch plus some tests
prototype2904 Dec 26, 2017
8f6e40a
Добавление namespace
Dec 27, 2017
de07dda
New version
LeoSko Dec 27, 2017
78e476c
Уход от pthreads
Dec 28, 2017
6547d7d
Добавлен метод get. Более-менее стабильная версия.
Dec 29, 2017
45192b7
Merge pull request #1 from prototype2904/roma
Dec 30, 2017
c87179d
Trying to add tests
Jan 4, 2018
72c6874
Gonna add methods
Jan 8, 2018
fa16332
Project test
Jan 8, 2018
a53dc21
contains, erase, insert, insert_with, update, emplace, find
Jan 8, 2018
b702daa
erase, erase_with
Dron642 Jan 8, 2018
8a90778
get with cmp, simple insert
Jan 8, 2018
bd37015
Merge branch 'master' of https://github.com/prototype2903/libcds
Jan 8, 2018
c693dee
find
prototype2904 Jan 8, 2018
ae1c78b
update update :)
Jan 8, 2018
f2a9b0e
Merge branch 'master' of https://github.com/prototype2904/libcds
Jan 8, 2018
7e9b106
fix
prototype2904 Jan 8, 2018
4ab51d9
Fixing tests
Jan 8, 2018
ec6ddfd
Merge branch 'master' of https://github.com/prototype2904/libcds
Jan 8, 2018
536b8a8
less errors maybe?
Jan 10, 2018
5bde49d
some errors correction
Dron642 Jan 10, 2018
330235c
Copied Cuckoo Map/Set with new name to setup hierarchy
Jan 13, 2018
7375489
some algorithm corrections
Dron642 Jan 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
660 changes: 660 additions & 0 deletions cds/container/hopscotch_hashmap.h
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 24 additions & 1 deletion projects/Win/vc141/cds.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2010
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "cds.vcxproj", "{408FE9BC-44F0-4E6A-89FA-D6F952584239}"
EndProject
Expand Down Expand Up @@ -459,6 +459,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-spsc-queue", "stress
{408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-map-hopscotch", "gtest-striped-map-hopscotch.vcxproj", "{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -1873,6 +1875,26 @@ Global
{CDC54B7B-B882-4CC8-87A2-E237D0D945B2}.vc14-Release|Win32.Build.0 = vc14-Release|Win32
{CDC54B7B-B882-4CC8-87A2-E237D0D945B2}.vc14-Release|x64.ActiveCfg = vc14-Release|x64
{CDC54B7B-B882-4CC8-87A2-E237D0D945B2}.vc14-Release|x64.Build.0 = vc14-Release|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Debug|Win32.ActiveCfg = Debug|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Debug|Win32.Build.0 = Debug|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Debug|x64.ActiveCfg = Debug|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Debug|x64.Build.0 = Debug|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.DebugVLD|Win32.Build.0 = DebugVLD|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.DebugVLD|x64.ActiveCfg = DebugVLD|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.DebugVLD|x64.Build.0 = DebugVLD|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Release|Win32.ActiveCfg = Release|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Release|Win32.Build.0 = Release|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Release|x64.ActiveCfg = Release|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.Release|x64.Build.0 = Release|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Debug|Win32.ActiveCfg = vc14-Debug|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Debug|Win32.Build.0 = vc14-Debug|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Debug|x64.ActiveCfg = vc14-Debug|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Debug|x64.Build.0 = vc14-Debug|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Release|Win32.ActiveCfg = vc14-Release|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Release|Win32.Build.0 = vc14-Release|Win32
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Release|x64.ActiveCfg = vc14-Release|x64
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D}.vc14-Release|x64.Build.0 = vc14-Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1960,6 +1982,7 @@ Global
{EACBF8EC-C58F-4CC8-9435-21BE9812287A} = {7DDE0A26-F02B-44FE-9206-552E39BC4A55}
{47B9F1F9-C9F1-4F25-842B-EE8E6447FE50} = {7DDE0A26-F02B-44FE-9206-552E39BC4A55}
{CDC54B7B-B882-4CC8-87A2-E237D0D945B2} = {7DDE0A26-F02B-44FE-9206-552E39BC4A55}
{78FF8F0D-9394-41CF-B895-BDC8538CDB1D} = {DE3B8DBB-5B4B-40DC-80DB-F0C15BC21E0F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3673AF8B-E81E-49E1-8241-B5FC94791FB8}
Expand Down
5 changes: 3 additions & 2 deletions projects/Win/vc141/cds.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
<ClCompile>
<AdditionalOptions>/wd4512 /wd4127 /Zc:inline /permissive- %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(GTEST_ROOT);$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_ENABLE_ATOMIC_ALIGNMENT_FIX;CDS_ENABLE_HPSTAT;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -251,7 +251,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(BOOST_PATH)/stage/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Expand Down Expand Up @@ -659,6 +659,7 @@
<ClInclude Include="..\..\..\cds\compiler\vc\x86\cxx11_atomic.h" />
<ClInclude Include="..\..\..\cds\container\basket_queue.h" />
<ClInclude Include="..\..\..\cds\container\bronson_avltree_map_rcu.h" />
<ClInclude Include="..\..\..\cds\container\hopscotch_hashmap.h" />
<ClInclude Include="..\..\..\cds\container\cuckoo_map.h" />
<ClInclude Include="..\..\..\cds\container\cuckoo_set.h" />
<ClInclude Include="..\..\..\cds\container\details\base.h" />
Expand Down
3 changes: 3 additions & 0 deletions projects/Win/vc141/cds.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,5 +1261,8 @@
<ClInclude Include="..\..\..\cds\details\size_t_cast.h">
<Filter>Header Files\cds\details</Filter>
</ClInclude>
<ClInclude Include="..\..\..\cds\container\hopscotch_hashmap.h">
<Filter>Header Files\cds\container</Filter>
</ClInclude>
</ItemGroup>
</Project>
Loading