Fixing issues after merging new code

- temporarily disable a race in asyncstreamreader
SignalR · Jul 18, 2013 · 18962ae · 18962ae
1 parent 79236da
commit 18962ae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/...oft.AspNet.SignalR.Client.Cpp.Samples/Microsoft.AspNet.SignalR.Client.Cpp.Samples.vcxproj b/...oft.AspNet.SignalR.Client.Cpp.Samples/Microsoft.AspNet.SignalR.Client.Cpp.Samples.vcxproj
@@ -56,7 +56,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Git\CPP\SignalR\src\Microsoft.AspNet.SignalR.Client.Cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)packages\cpprestsdk.1.0.0\build\native\include;$(SolutionDir)src\Microsoft.AspNet.SignalR.Client.Cpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj b/samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj
@@ -393,7 +393,9 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="ClientBin\" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
       <Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>

diff --git a/src/Microsoft.AspNet.SignalR.Client.Cpp/AsyncStreamReader.cpp b/src/Microsoft.AspNet.SignalR.Client.Cpp/AsyncStreamReader.cpp
@@ -9,10 +9,13 @@ AsyncStreamReader::AsyncStreamReader(streams::basic_istream<uint8_t> stream)
 
 AsyncStreamReader::~AsyncStreamReader(void)
 {
+    // potential race: after cancellation and the class is freed, Close(OperationCanceledException("readTask")) is called
+    mReadCts.cancel();
 }
 
 void AsyncStreamReader::Start()
 {
+
     State initial = State::Initial;
 
     if (atomic_compare_exchange_strong<State>(&mReadingState, &initial, State::Processing))
@@ -59,7 +62,7 @@ void AsyncStreamReader::Process()
         }
         catch (task_canceled canceled)
         {
-            Close(OperationCanceledException("readTask"));
+            //Close(OperationCanceledException("readTask"));
         }
         catch (exception& ex)
         {
@@ -85,7 +88,7 @@ void AsyncStreamReader::ReadAsync(task<unsigned int> readTask)
         }
         catch (task_canceled canceled)
         {
-            Close(OperationCanceledException("readTask"));
+            //Close(OperationCanceledException("readTask"));
         }
         catch (exception& ex)
         {
@@ -134,18 +137,16 @@ void AsyncStreamReader::Close(exception& ex)
 
     if(previousState != State::Stopped)
     {
-        // cancel any ongoing reads
-        mReadCts.cancel();
-
         if (Closed != nullptr)
         {
             Closed(ex);
         }
 
-        {
-            lock_guard<mutex> lock(mBufferLock);
-            pReadBuffer.reset();
-        }
+        // pReadBuffer is a shared pointer and is freed automatically?
+        //{
+        //    lock_guard<mutex> lock(mBufferLock);
+        //    pReadBuffer.reset();
+        //}
     }
 }
 

diff --git a/...crosoft.AspNet.SignalR.Client.Cpp.Tests/Microsoft.AspNet.SignalR.Client.Cpp.Tests.vcxproj b/...crosoft.AspNet.SignalR.Client.Cpp.Tests/Microsoft.AspNet.SignalR.Client.Cpp.Tests.vcxproj
@@ -57,7 +57,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Git\CPP\SignalR\src\Microsoft.AspNet.SignalR.Client.Cpp;D:\Git\CPP\SignalR\tests\Microsoft.AspNet.SignalR.Client.Cpp.Tests\UnitTestpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)packages\cpprestsdk.1.0.0\build\native\include;D:\Git\CPP\SignalR\src\Microsoft.AspNet.SignalR.Client.Cpp;D:\Git\CPP\SignalR\tests\Microsoft.AspNet.SignalR.Client.Cpp.Tests\UnitTestpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>