Skip to content

Commit a27cd1e

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into 2.6.0bump
2 parents b3db9a0 + 0134d8f commit a27cd1e

File tree

83 files changed

+157
-1083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+157
-1083
lines changed

‎Build/Common.Build.settings

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,8 @@
4343
<WebsocketppIncludeDir>$(BuildRoot)\Release\libs\websocketpp</WebsocketppIncludeDir>
4444
<PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\packages')">$(BuildRoot)\packages</PackagesRoot>
4545
<PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\packages')">$(BuildRoot)\..\Tools\packages</PackagesRoot>
46-
<CollateralsDir>$(BuildRoot)\Release\Collateral</CollateralsDir>
4746
</PropertyGroup>
4847

49-
<!-- try locating configuration file -->
50-
<Import Condition="Exists('$(BuildRoot)\..\Build\environment.casablanca.settings')" Project="$(BuildRoot)\..\Build\environment.casablanca.settings"/>
51-
5248
<!-- paths will not be overridden -->
5349
<PropertyGroup>
5450
<OutDir Condition="'$(OutDir)' != '' and !HasTrailingSlash('$(OutDir)')">$(OutDir)\</OutDir>

‎Build/Release.Tests.settings

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,12 @@
1616

1717
<PropertyGroup>
1818
<CommonTestIncludeDir>$(TestRoot)\Common\utilities\include;$(TestRoot)\Common\UnitTestpp</CommonTestIncludeDir>
19-
<TestListenerPath>$(TestRoot)\Functional\http\utilities\testlistener</TestListenerPath>
20-
<CasablancaIncludeDir>$(BinariesDirectory)\inc;$(CasablancaIncludeDir);$(TestListenerPath)\include;</CasablancaIncludeDir>
19+
<CasablancaIncludeDir>$(BinariesDirectory)\inc;$(CasablancaIncludeDir)</CasablancaIncludeDir>
2120
</PropertyGroup>
2221

2322
<!-- Target that can be used to easily strip the AppContainer requirement from a dll -->
2423
<Target Name="StripAppContainerOnProjectDll">
2524
<Exec Command="link /edit /appcontainer:no $(OutDir)\$(ProjectName).dll" />
26-
27-
<!-- In razzle for some reason the output is in sub directory. -->
28-
<ItemGroup Condition="'$(BuildInRazzle)'!=''">
29-
<ProjectBinaries Include="$(OutDir)\*" />
30-
</ItemGroup>
31-
<Copy Condition="'$(BuildInRazzle)'!=''" SourceFiles="@(ProjectBinaries)" DestinationFolder="$(OutDir)..\" />
3225
</Target>
3326

3427
</Project>

‎Release/dirs.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
44

5-
<ItemGroup Condition="'$(BuildInRazzle)'=='' or '$(BuildAgainstVSInstallation)'==''">
5+
<ItemGroup>
66
<ProjectFile Include="src\dirs.proj"/>
77
</ItemGroup>
88

9-
<ItemGroup Condition="'$(BuildInRazzle)'=='' or '$(BuildTests)'!=''">
9+
<ItemGroup Condition="'$(BuildTests)'!=''">
1010
<ProjectFile Include="tests\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
1111
<ProjectFile Include="samples\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
1212
</ItemGroup>

‎Release/src/http/listener/http_server_httpsys.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,17 @@ void http_windows_server::receive_requests()
425425
{
426426
HTTP_REQUEST p_request;
427427
ULONG bytes_received;
428-
for(;;)
428+
429+
// Oversubscribe since this is a blocking call and we don't want to count
430+
// towards the concurrency runtime's thread count. A more proper fix
431+
// would be to use Overlapped I/O and asynchronously call HttpReceiveHttpRequest.
432+
// This requires additional work to be careful sychronizing with the listener
433+
// shutdown. This is much easier especially given the http_listener is 'experimental'
434+
// and with VS2015 PPL tasks run on the threadpool.
435+
#if _MSC_VER < 1900
436+
concurrency::Context::Oversubscribe(true);
437+
#endif
438+
for (;;)
429439
{
430440
unsigned long error_code = HttpReceiveHttpRequest(
431441
m_hRequestQueue,
@@ -436,7 +446,7 @@ void http_windows_server::receive_requests()
436446
&bytes_received,
437447
0);
438448

439-
if(error_code != NO_ERROR && error_code != ERROR_MORE_DATA)
449+
if (error_code != NO_ERROR && error_code != ERROR_MORE_DATA)
440450
{
441451
break;
442452
}
@@ -447,6 +457,9 @@ void http_windows_server::receive_requests()
447457
http_request msg = http_request::_create_request(std::move(pRequestContext));
448458
pContext->async_process_request(p_request.RequestId, msg, bytes_received);
449459
}
460+
#if _MSC_VER < 1900
461+
concurrency::Context::Oversubscribe(false);
462+
#endif
450463
}
451464

452465
pplx::task<void> http_windows_server::respond(http::http_response response)

‎Release/tests/common/TestRunner/vs11/TestRunner110.vcxproj.vspscc

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Release/tests/common/TestRunner/vs12.winrt/TestRunner120.winrt.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\..\..\cpprest.razzle.props" Condition="exists('..\..\..\..\..\cpprest.razzle.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|ARM">
65
<Configuration>Debug</Configuration>
@@ -246,7 +245,6 @@
246245
</ProjectReference>
247246
</ItemGroup>
248247
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
249-
<Import Project="..\..\..\..\..\cpprest.razzle.targets" Condition="exists('..\..\..\..\..\cpprest.razzle.targets')" />
250248
<ImportGroup Label="ExtensionTargets">
251249
</ImportGroup>
252250
</Project>

‎Release/tests/common/TestRunner/vs12/TestRunner120.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props" Condition="exists('$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|ARM">
65
<Configuration>Debug</Configuration>
@@ -246,7 +245,6 @@
246245
</ProjectReference>
247246
</ItemGroup>
248247
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
249-
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
250248
<ImportGroup Label="ExtensionTargets">
251249
</ImportGroup>
252250
</Project>

‎Release/tests/common/TestRunner/vs14.winrt/TestRunner140.winrt.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\..\..\cpprest.razzle.props" Condition="exists('..\..\..\..\..\cpprest.razzle.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|ARM">
65
<Configuration>Debug</Configuration>
@@ -246,7 +245,6 @@
246245
</ProjectReference>
247246
</ItemGroup>
248247
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
249-
<Import Project="..\..\..\..\..\cpprest.razzle.targets" Condition="exists('..\..\..\..\..\cpprest.razzle.targets')" />
250248
<ImportGroup Label="ExtensionTargets">
251249
</ImportGroup>
252250
</Project>

‎Release/tests/common/TestRunner/vs14/TestRunner140.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props" Condition="exists('$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|ARM">
65
<Configuration>Debug</Configuration>
@@ -244,7 +243,6 @@
244243
</ProjectReference>
245244
</ItemGroup>
246245
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
247-
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
248246
<ImportGroup Label="ExtensionTargets">
249247
</ImportGroup>
250248
</Project>

‎Release/tests/common/UnitTestpp/vs11/TestUnitTestpp110.vcxproj.vspscc

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)