Skip to content

Commit 2a7f5be

Browse files
divanchykhindivanchykhin
committed
updating server and test_co_await test projects
1 parent dfc1de2 commit 2a7f5be

File tree

6 files changed

+65
-39
lines changed

6 files changed

+65
-39
lines changed

‎test/experimental/test_co_await/co_await_hierarchy.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ class data_reader
9393

9494
void await_suspend(std::experimental::coroutine_handle<> awaiting) {
9595
ah = awaiting;
96-
nodecpp::setNoException(awaiting);
96+
nodecpp::initCoroData(awaiting);
9797
set_read_awaiting_handle( myIdx, awaiting );
9898
}
9999

100100
auto await_resume() {
101-
if ( ah != nullptr && nodecpp::isException(ah) )
102-
throw nodecpp::getException(ah);
101+
if ( ah != nullptr && nodecpp::isCoroException(ah) )
102+
throw nodecpp::getCoroException(ah);
103103
return;
104104
}
105105
};
@@ -130,15 +130,15 @@ class data_reader
130130
ah = awaiting;
131131
// std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>> h = std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>>::from_address(awaiting.address());
132132
// h.promise().edata.is_exception = false;
133-
nodecpp::setNoException(awaiting);
133+
nodecpp::initCoroData(awaiting);
134134
set_read_awaiting_handle( myIdx, awaiting );
135135
}
136136

137137
auto await_resume() {
138138
// std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>> h = std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>>::from_address(ah.address());
139139
read_result r = read_data(myIdx);
140-
if ( ah != nullptr && nodecpp::isException(ah) )
141-
throw nodecpp::getException(ah);
140+
if ( ah != nullptr && nodecpp::isCoroException(ah) )
141+
throw nodecpp::getCoroException(ah);
142142
return r.data;
143143
}
144144
};
@@ -552,7 +552,7 @@ void processing_loop_2()
552552
{
553553
auto tmp = g_callbacks[ch - 'a'].awaiting;
554554
std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>> h = std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>>::from_address(tmp.address());
555-
nodecpp::setException(tmp, std::exception());
555+
nodecpp::setCoroException(tmp, std::exception());
556556
g_callbacks[ch - 'a'].awaiting = nullptr;
557557
tmp();
558558
}
@@ -681,7 +681,7 @@ void processing_loop()
681681
{
682682
auto tmp = g_callbacks[ch - 'a'].awaiting;
683683
std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>> h = std::experimental::coroutine_handle<nodecpp::promise_type_struct<void>>::from_address(tmp.address());
684-
nodecpp::setException(tmp, std::exception());
684+
nodecpp::setCoroException(tmp, std::exception());
685685
g_callbacks[ch - 'a'].awaiting = nullptr;
686686
tmp();
687687
}

‎test/experimental/test_co_await/test_co_await.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
int main()
88
{
9-
nodecpp::log::init_log();
9+
// nodecpp::log::init_log();
1010
processing_loop();
1111

1212
return 0;

‎test/experimental/test_co_await/test_co_await.vcxproj‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@
2222
<ProjectGuid>{2EED9456-7BFA-46C4-8AA6-A584DE5CD06C}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>test_co_await</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v142</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3535
<ConfigurationType>Application</ConfigurationType>
3636
<UseDebugLibraries>false</UseDebugLibraries>
37-
<PlatformToolset>v141</PlatformToolset>
37+
<PlatformToolset>v142</PlatformToolset>
3838
<WholeProgramOptimization>true</WholeProgramOptimization>
3939
<CharacterSet>Unicode</CharacterSet>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4242
<ConfigurationType>Application</ConfigurationType>
4343
<UseDebugLibraries>true</UseDebugLibraries>
44-
<PlatformToolset>v141</PlatformToolset>
44+
<PlatformToolset>v142</PlatformToolset>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>Application</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v141</PlatformToolset>
50+
<PlatformToolset>v142</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>
@@ -75,15 +75,15 @@
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7777
<LinkIncremental>true</LinkIncremental>
78-
<IncludePath>../../../include/nodecpp;../../../safe_memory/library/src/iibmalloc/src/foundation/include;../../../safe_memory/library/src/iibmalloc/src/foundation/3rdparty/fmt/include;../../../safe_memory/library/src/iibmalloc/src;../../../safe_memory/library/src;../../../include;../../../src;$(IncludePath)</IncludePath>
78+
<IncludePath>../../../include/nodecpp;../../../safe_memory/library/src/iibmalloc/src/foundation/include;../../../safe_memory/library/src/iibmalloc/src/foundation/3rdparty/fmt/include;../../../safe_memory/library/src/iibmalloc/src;../../../safe_memory/library/include;../../../safe_memory/library/src;../../../include;../../../src;$(IncludePath)</IncludePath>
7979
</PropertyGroup>
8080
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8181
<LinkIncremental>false</LinkIncremental>
8282
<IncludePath>../../../include/nodecpp;../../../safe_memory/library/src/iibmalloc/src/foundation/include;../../../safe_memory/library/src/iibmalloc/src/foundation/3rdparty/fmt/include;../../../safe_memory/library/src/iibmalloc/src;../../../safe_memory/library/src;../../../include;../../../src;$(IncludePath)</IncludePath>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8585
<LinkIncremental>false</LinkIncremental>
86-
<IncludePath>../../../include/nodecpp;../../../safe_memory/library/src/iibmalloc/src/foundation/include;../../../safe_memory/library/src/iibmalloc/src/foundation/3rdparty/fmt/include;../../../safe_memory/library/src/iibmalloc/src;../../../safe_memory/library/src;../../../include;../../../src;$(IncludePath)</IncludePath>
86+
<IncludePath>../../../include/nodecpp;../../../safe_memory/library/src/iibmalloc/src/foundation/include;../../../safe_memory/library/src/iibmalloc/src/foundation/3rdparty/fmt/include;../../../safe_memory/library/src/iibmalloc/src;../../../safe_memory/library/include;../../../safe_memory/library/src;../../../include;../../../src;$(IncludePath)</IncludePath>
8787
</PropertyGroup>
8888
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8989
<ClCompile>
@@ -105,7 +105,7 @@
105105
<PrecompiledHeader>NotUsing</PrecompiledHeader>
106106
<WarningLevel>Level3</WarningLevel>
107107
<Optimization>Disabled</Optimization>
108-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109109
<SDLCheck>true</SDLCheck>
110110
<LanguageStandard>stdcpp17</LanguageStandard>
111111
<AdditionalOptions>/await /await %(AdditionalOptions)</AdditionalOptions>
@@ -141,7 +141,7 @@
141141
<Optimization>MaxSpeed</Optimization>
142142
<FunctionLevelLinking>true</FunctionLevelLinking>
143143
<IntrinsicFunctions>true</IntrinsicFunctions>
144-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145145
<SDLCheck>true</SDLCheck>
146146
<AdditionalOptions>/await /await %(AdditionalOptions)</AdditionalOptions>
147147
<LanguageStandard>stdcpp17</LanguageStandard>
@@ -159,12 +159,15 @@
159159
<ItemGroup>
160160
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\3rdparty\fmt\src\format.cc" />
161161
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\cpu_exceptions_translator.cpp" />
162+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\internal_msg.cpp" />
162163
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\log.cpp" />
164+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\nodecpp_assert.cpp" />
165+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\page_allocator.cpp" />
163166
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\safe_memory_error.cpp" />
167+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\stack_info.cpp" />
164168
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\std_error.cpp" />
165169
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\tagged_ptr_impl.cpp" />
166170
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\iibmalloc.cpp" />
167-
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\page_allocator_windows.cpp" />
168171
<ClCompile Include="..\..\..\safe_memory\library\src\safe_ptr.cpp" />
169172
<ClCompile Include="co_await_hierarchy.cpp">
170173
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
@@ -176,6 +179,7 @@
176179
</ItemGroup>
177180
<ItemGroup>
178181
<ClInclude Include="..\..\..\include\nodecpp\awaitable.h" />
182+
<ClInclude Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\stack_info_impl.h" />
179183
<ClInclude Include="tests.h" />
180184
</ItemGroup>
181185
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎test/experimental/test_co_await/test_co_await.vcxproj.filters‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
<ClCompile Include="..\..\..\safe_memory\library\src\safe_ptr.cpp">
2828
<Filter>Source Files</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\page_allocator_windows.cpp">
31-
<Filter>Source Files</Filter>
32-
</ClCompile>
3330
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\3rdparty\fmt\src\format.cc">
3431
<Filter>Source Files</Filter>
3532
</ClCompile>
@@ -51,6 +48,18 @@
5148
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\iibmalloc.cpp">
5249
<Filter>Source Files</Filter>
5350
</ClCompile>
51+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\internal_msg.cpp">
52+
<Filter>Source Files</Filter>
53+
</ClCompile>
54+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\nodecpp_assert.cpp">
55+
<Filter>Source Files</Filter>
56+
</ClCompile>
57+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\page_allocator.cpp">
58+
<Filter>Source Files</Filter>
59+
</ClCompile>
60+
<ClCompile Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\stack_info.cpp">
61+
<Filter>Source Files</Filter>
62+
</ClCompile>
5463
</ItemGroup>
5564
<ItemGroup>
5665
<ClInclude Include="tests.h">
@@ -59,5 +68,8 @@
5968
<ClInclude Include="..\..\..\include\nodecpp\awaitable.h">
6069
<Filter>Header Files</Filter>
6170
</ClInclude>
71+
<ClInclude Include="..\..\..\safe_memory\library\src\iibmalloc\src\foundation\src\stack_info_impl.h">
72+
<Filter>Header Files</Filter>
73+
</ClInclude>
6274
</ItemGroup>
6375
</Project>

0 commit comments

Comments
 (0)