整理测试代码

benchmark/benchmark_async_mem.cpp

@@ -7,7 +7,7 @@
 
 #include "librf.h"
 
-const size_t N = 1000000;
+const size_t N = 5000000;
 const size_t LOOP_COUNT = 50;
 
 volatile size_t globalValue = 0;

librf/src/mutex_v2.inl

@@ -536,7 +536,7 @@ RESUMEF_NS
 		};
 
 		template<class... _Mtxs>
-		scoped_unlock_t()->scoped_unlock_t<scoped_unlock_t<_Mtxs...>&&>;
+		scoped_unlock_t()->scoped_unlock_t<_Mtxs...>;
 
 		template<class... _Mtxs, typename>
 		inline future_t<scoped_unlock_t<_Mtxs...>> mutex_t::lock(_Mtxs&... mtxs)

tutorial/test_async_mutex.cpp

@@ -105,13 +105,13 @@ static std::thread test_mutex_async_push(size_t idx)
 		{
 			if (g_lock.try_lock_for(500ms, &provide_unique_address))
 			{
-				//scoped_unlock_t _locker(std::adopt_lock, g_lock, &provide_unique_address);
+				scoped_unlock_t _locker(std::adopt_lock, &provide_unique_address, g_lock);
 
 				++g_counter;
 				std::cout << "push:" << g_counter << " on " << idx << std::endl;
 				std::this_thread::sleep_for(50ms);
 
-				g_lock.unlock(&provide_unique_address);
+				//g_lock.unlock(&provide_unique_address);
 			}
 
 			std::this_thread::sleep_for(50ms);

vs_proj/librf.vcxproj

@@ -23,18 +23,18 @@
     <ProjectGuid>{C1D4A6BD-592F-4E48-8178-7C87219BF80E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>librf</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>ClangCL</PlatformToolset>
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>ClangCL</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
@@ -46,7 +46,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>ClangCL</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
@@ -73,10 +73,12 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <EnableMicrosoftCodeAnalysis>false</EnableMicrosoftCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <EnableMicrosoftCodeAnalysis>false</EnableMicrosoftCodeAnalysis>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -86,7 +88,7 @@
       <AdditionalIncludeDirectories>..\librf;..\..\asio\asio\include;..\..\asio-1.10.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/await</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
       <OmitFramePointers />
       <DisableSpecificWarnings>4834</DisableSpecificWarnings>
       <SDLCheck>true</SDLCheck>
@@ -127,7 +129,7 @@
       <AdditionalIncludeDirectories>..\librf;..\..\asio\asio\include;..\..\asio-1.10.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/await</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
       <StringPooling>true</StringPooling>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>