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.

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
Changes from 2 commits
Commits
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
26 changes: 25 additions & 1 deletion cds/container/hopscotch_hashmap.h
Original file line number Diff line number Diff line change
@@ -154,7 +154,31 @@ namespace cds {
template <typename K, typename Func>
bool find(K const& key, Func f)
{
return find(key, [&f](node_type& item, K const&) { f(item.m_val); });
DATA data = get(key, [=](K const& one, K const& two) { return one != two; });
f(data);
return *data != NULL;
}

template <typename K, typename Predicate>
bool find(K const& key, Predicate pred)
{
DATA data = get(key, pred);
return *data != NULL;
}

template <typename K>
bool find(K const& key)
{
DATA data = get(key, [=](K const& one, K const& two) { return one != two; });
return *data != NULL;
}

template <typename K, typename Predicate, typename Func>
bool find_with(K const& key, Predicate pred, Func f)
{
DATA data = get(key, [=](K const& one, K const& two) { return one != two; });
f(data);
return *data != NULL;
}

/// For key \p key inserts data of type \ref value_type constructed with <tt>std::forward<Args>(args)...</tt>
4 changes: 2 additions & 2 deletions projects/Win/vc141/cds.vcxproj
Original file line number Diff line number Diff line change
@@ -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>
@@ -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>
2 changes: 1 addition & 1 deletion projects/Win/vc141/gtest-striped-map-hopscotch.vcxproj
Original file line number Diff line number Diff line change
@@ -220,7 +220,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(GTEST_ROOT)\include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions) /Zc:inline /permissive- </AdditionalOptions>
</ClCompile>
<Link>
1 change: 0 additions & 1 deletion test/unit/main.cpp
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@ namespace cds_test {
/*static*/ std::mt19937 fixture::random_gen_( random_dev_() );
} // namespace cds_test


using namespace std;

int main( int argc, char **argv )