From 80416dc50cce9fae908e59e83a699af0c0ee9531 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Sat, 19 Jan 2019 00:24:57 -0800 Subject: Fix build for ProjectN/WinRTInterop Delete superfluous AsyncCausalityTracer arguments Signed-off-by: dotnet-bot --- .../Threading/Tasks/AsyncCausalitySupport.cs | 6 ++-- .../shared/System.Private.CoreLib.Shared.projitems | 1 + .../Runtime/CompilerServices/AsyncMethodBuilder.cs | 22 ++++++------ .../Threading/Tasks/AsyncCausalityTracer.Noop.cs | 41 +++------------------- .../Tasks/AsyncCausalityTracerConstants.cs | 30 ++++++++++++++++ 5 files changed, 49 insertions(+), 51 deletions(-) create mode 100644 src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracerConstants.cs (limited to 'src') diff --git a/src/System.Private.CoreLib/shared/Internal/Threading/Tasks/AsyncCausalitySupport.cs b/src/System.Private.CoreLib/shared/Internal/Threading/Tasks/AsyncCausalitySupport.cs index ab3e52fcd9..dcea41dbab 100644 --- a/src/System.Private.CoreLib/shared/Internal/Threading/Tasks/AsyncCausalitySupport.cs +++ b/src/System.Private.CoreLib/shared/Internal/Threading/Tasks/AsyncCausalitySupport.cs @@ -38,19 +38,19 @@ namespace Internal.Threading.Tasks [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void TraceOperationCreation(Task task, string operationName) { - AsyncCausalityTracer.TraceOperationCreation(CausalityTraceLevel.Required, task.Id, operationName, 0); + AsyncCausalityTracer.TraceOperationCreation(task, operationName); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void TraceOperationCompletedSuccess(Task task) { - AsyncCausalityTracer.TraceOperationCompletion(CausalityTraceLevel.Required, task.Id, AsyncCausalityStatus.Completed); + AsyncCausalityTracer.TraceOperationCompletion(task, AsyncCausalityStatus.Completed); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void TraceOperationCompletedError(Task task) { - AsyncCausalityTracer.TraceOperationCompletion(CausalityTraceLevel.Required, task.Id, AsyncCausalityStatus.Error); + AsyncCausalityTracer.TraceOperationCompletion(task, AsyncCausalityStatus.Error); } } } diff --git a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems index 9a94bdf536..944cf62a83 100644 --- a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems @@ -774,6 +774,7 @@ + diff --git a/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/AsyncMethodBuilder.cs b/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/AsyncMethodBuilder.cs index 5a78653f71..f861998381 100644 --- a/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/AsyncMethodBuilder.cs +++ b/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/AsyncMethodBuilder.cs @@ -11,7 +11,6 @@ // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- using System.Diagnostics; -using System.Diagnostics.Tracing; using System.Reflection; using System.Runtime.ExceptionServices; #if FEATURE_COMINTEROP @@ -22,7 +21,6 @@ using System.Threading.Tasks; using System.Text; using Internal.Runtime.CompilerServices; using Internal.Runtime.Augments; -using Internal.Threading.Tasks; #if CORERT using Thread = Internal.Runtime.Augments.RuntimeThread; @@ -95,9 +93,9 @@ namespace System.Runtime.CompilerServices /// Completes the method builder successfully. public void SetResult() { - if (AsyncCausalitySupport.LoggingOn) + if (AsyncCausalityTracer.LoggingOn) { - AsyncCausalitySupport.TraceOperationCompletedSuccess(this.Task); + AsyncCausalityTracer.TraceOperationCompletion(this.Task, AsyncCausalityStatus.Completed); } // Mark the builder as completed. As this is a void-returning method, this mostly @@ -121,9 +119,9 @@ namespace System.Runtime.CompilerServices ThrowHelper.ThrowArgumentNullException(ExceptionArgument.exception); } - if (AsyncCausalitySupport.LoggingOn) + if (AsyncCausalityTracer.LoggingOn) { - AsyncCausalitySupport.TraceOperationCompletedError(this.Task); + AsyncCausalityTracer.TraceOperationCompletion(this.Task, AsyncCausalityStatus.Error); } if (_synchronizationContext != null) @@ -575,10 +573,10 @@ namespace System.Runtime.CompilerServices { Debug.Assert(!IsCompleted); - bool loggingOn = AsyncCausalitySupport.LoggingOn; + bool loggingOn = AsyncCausalityTracer.LoggingOn; if (loggingOn) { - AsyncCausalityTracer.TraceSynchronousWorkStart(CausalityTraceLevel.Required, this.Id, CausalitySynchronousWork.Execution); + AsyncCausalityTracer.TraceSynchronousWorkStart(this, CausalitySynchronousWork.Execution); } ExecutionContext context = Context; @@ -619,7 +617,7 @@ namespace System.Runtime.CompilerServices if (loggingOn) { - AsyncCausalityTracer.TraceSynchronousWorkCompletion(CausalityTraceLevel.Required, CausalitySynchronousWork.Execution); + AsyncCausalityTracer.TraceSynchronousWorkCompletion(CausalitySynchronousWork.Execution); } } @@ -698,7 +696,7 @@ namespace System.Runtime.CompilerServices { Debug.Assert(m_task != null, "Expected non-null task"); - if (AsyncCausalitySupport.LoggingOn || System.Threading.Tasks.Task.s_asyncDebuggingEnabled) + if (AsyncCausalityTracer.LoggingOn || System.Threading.Tasks.Task.s_asyncDebuggingEnabled) { LogExistingTaskCompletion(); } @@ -714,9 +712,9 @@ namespace System.Runtime.CompilerServices { Debug.Assert(m_task != null); - if (AsyncCausalitySupport.LoggingOn) + if (AsyncCausalityTracer.LoggingOn) { - AsyncCausalitySupport.TraceOperationCompletedSuccess(m_task); + AsyncCausalityTracer.TraceOperationCompletion(m_task, AsyncCausalityStatus.Completed); } // only log if we have a real task that was previously created diff --git a/src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracer.Noop.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracer.Noop.cs index c3f787b36b..b00d5d6756 100644 --- a/src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracer.Noop.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracer.Noop.cs @@ -6,37 +6,6 @@ using System.Diagnostics; namespace System.Threading.Tasks { - internal enum CausalityTraceLevel - { - Required = 0, - Important = 1, - Verbose = 2, - } - - internal enum AsyncCausalityStatus - { - Started = 0, - Completed = 1, - Canceled = 2, - Error = 3, - } - - internal enum CausalityRelation - { - AssignDelegate = 0, - Join = 1, - Choice = 2, - Cancel = 3, - Error = 4, - } - - internal enum CausalitySynchronousWork - { - CompletionNotification = 0, - ProgressNotification = 1, - Execution = 2, - } - // // Empty implementation of AsyncCausality events // @@ -50,27 +19,27 @@ namespace System.Threading.Tasks } [Conditional("NOOP_ASYNCCASUALITYTRACER")] - public static void TraceOperationCreation(CausalityTraceLevel traceLevel, int taskId, string operationName, ulong relatedContext) + public static void TraceOperationCreation(Task task, string operationName) { } [Conditional("NOOP_ASYNCCASUALITYTRACER")] - public static void TraceOperationCompletion(CausalityTraceLevel traceLevel, int taskId, AsyncCausalityStatus status) + public static void TraceOperationCompletion(Task task, AsyncCausalityStatus status) { } [Conditional("NOOP_ASYNCCASUALITYTRACER")] - public static void TraceOperationRelation(CausalityTraceLevel traceLevel, int taskId, CausalityRelation relation) + public static void TraceOperationRelation(Task task, CausalityRelation relation) { } [Conditional("NOOP_ASYNCCASUALITYTRACER")] - public static void TraceSynchronousWorkStart(CausalityTraceLevel traceLevel, int taskId, CausalitySynchronousWork work) + public static void TraceSynchronousWorkStart(Task task, CausalitySynchronousWork work) { } [Conditional("NOOP_ASYNCCASUALITYTRACER")] - public static void TraceSynchronousWorkCompletion(CausalityTraceLevel traceLevel, CausalitySynchronousWork work) + public static void TraceSynchronousWorkCompletion(CausalitySynchronousWork work) { } } diff --git a/src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracerConstants.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracerConstants.cs new file mode 100644 index 0000000000..3677051f05 --- /dev/null +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/AsyncCausalityTracerConstants.cs @@ -0,0 +1,30 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace System.Threading.Tasks +{ + internal enum AsyncCausalityStatus + { + Started = 0, + Completed = 1, + Canceled = 2, + Error = 3, + } + + internal enum CausalityRelation + { + AssignDelegate = 0, + Join = 1, + Choice = 2, + Cancel = 3, + Error = 4, + } + + internal enum CausalitySynchronousWork + { + CompletionNotification = 0, + ProgressNotification = 1, + Execution = 2, + } +} -- cgit v1.2.3