Review feedback

dotnet · Jan 18, 2019 · 8911d0c · 8911d0c
1 parent 0fab23c
commit 8911d0c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/src/System.Private.CoreLib/shared/Internal/Threading/Tasks/AsyncCausalitySupport.cs b/src/System.Private.CoreLib/shared/Internal/Threading/Tasks/AsyncCausalitySupport.cs
@@ -52,18 +52,6 @@ public static void TraceOperationCompletedError(Task task)
         {
             AsyncCausalityTracer.TraceOperationCompletion(CausalityTraceLevel.Required, task.Id, AsyncCausalityStatus.Error);
         }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void TraceSynchronousWorkStart(Task task)
-        {
-            AsyncCausalityTracer.TraceSynchronousWorkStart(CausalityTraceLevel.Required, task.Id, CausalitySynchronousWork.Execution);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void TraceSynchronousWorkCompletion()
-        {
-            AsyncCausalityTracer.TraceSynchronousWorkCompletion(CausalityTraceLevel.Required, CausalitySynchronousWork.Execution);
-        }
     }
 }
 
diff --git a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems
@@ -771,7 +771,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\SpinWait.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\SynchronizationLockException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\AsyncCausalityTracer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\ConcurrentExclusiveSchedulerPair.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\Future.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\ProducerConsumerQueues.cs" />
@@ -972,6 +971,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\SafeBSTRHandle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecureString.Windows.cs" />
   </ItemGroup>
+  <ItemGroup Condition="$(FeatureAsyncCausalityTracer)' != 'true'">
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\AsyncCausalityTracer.Noop.cs" />
+  </ItemGroup>
   <ItemGroup Condition="$(TargetsWindows) and '$(EnableWinRT)' != 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)Internal\Win32\RegistryKey.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Advapi32\Interop.RegCloseKey.cs" />

diff --git a/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/AsyncMethodBuilder.cs b/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/AsyncMethodBuilder.cs
@@ -578,7 +578,7 @@ private void MoveNext(Thread threadPoolThread)
                 bool loggingOn = AsyncCausalitySupport.LoggingOn;
                 if (loggingOn)
                 {
-                    AsyncCausalitySupport.TraceSynchronousWorkStart(this);
+                    AsyncCausalityTracer.TraceSynchronousWorkStart(CausalityTraceLevel.Required, this.Id, CausalitySynchronousWork.Execution);
                 }
 
                 ExecutionContext context = Context;
@@ -619,7 +619,7 @@ private void MoveNext(Thread threadPoolThread)
 
                 if (loggingOn)
                 {
-                    AsyncCausalitySupport.TraceSynchronousWorkCompletion();
+                    AsyncCausalityTracer.TraceSynchronousWorkCompletion(CausalityTraceLevel.Required, CausalitySynchronousWork.Execution);
                 }
             }
 

diff --git a/...m/Threading/Tasks/AsyncCausalityTracer.cs → ...eading/Tasks/AsyncCausalityTracer.Noop.cs b/...m/Threading/Tasks/AsyncCausalityTracer.cs → ...eading/Tasks/AsyncCausalityTracer.Noop.cs