diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2019-01-21 21:02:55 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-01-22 04:15:31 -0800 |
| commit | 61ff7397e849273bafc8b1e46ec88ddd905ce187 (patch) | |
| tree | 1c6015f4bbb8a803fdcca2202eea77d2c3aeb39a | |
| parent | 5c9febf6346f90c06e70b3cb9e002300e50fa54b (diff) | |
| download | coreclr-61ff7397e849273bafc8b1e46ec88ddd905ce187.tar.gz coreclr-61ff7397e849273bafc8b1e46ec88ddd905ce187.tar.bz2 coreclr-61ff7397e849273bafc8b1e46ec88ddd905ce187.zip | |
Fix CoreRT build breaks
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs | 6 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs b/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs index fde28527b4..7ef4523622 100644 --- a/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs +++ b/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs @@ -606,7 +606,7 @@ namespace System.Diagnostics.Tracing #endregion } -#if ES_BUILD_STANDALONE || ES_BUILD_PN +#if ES_BUILD_STANDALONE /******************************** SUPPORT *****************************/ /// <summary> /// This is supplied by the framework. It is has the semantics that the value is copied to any new Tasks that is created @@ -615,11 +615,7 @@ namespace System.Diagnostics.Tracing /// only get your thread local copy which means that you never have races. /// </summary> /// -#if ES_BUILD_STANDALONE [EventSource(Name = "Microsoft.Tasks.Nuget")] -#else - [EventSource(Name = "System.Diagnostics.Tracing.TplEtwProvider")] -#endif internal class TplEtwProvider : EventSource { public class Keywords diff --git a/src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs index 311445ec28..3e2d42b19c 100644 --- a/src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs @@ -469,7 +469,7 @@ namespace System.Threading.Tasks public void TraceOperationRelation(int TaskID, CausalityRelation Relation) { if (IsEnabled() && IsEnabled(EventLevel.Informational, Keywords.AsyncCausalityRelation)) - WriteEvent(TRACEOPERATIONRELATION_ID, TaskID, (int)Relation); // optmized overload for this exists + WriteEvent(TRACEOPERATIONRELATION_ID, TaskID, (int)Relation); // optimized overload for this exists } [Event(TRACEOPERATIONSTOP_ID, Version = 1, @@ -477,7 +477,7 @@ namespace System.Threading.Tasks public void TraceOperationEnd(int TaskID, AsyncCausalityStatus Status) { if (IsEnabled() && IsEnabled(EventLevel.Informational, Keywords.AsyncCausalityOperation)) - WriteEvent(TRACEOPERATIONSTOP_ID, TaskID, (int)Status); // optmized overload for this exists + WriteEvent(TRACEOPERATIONSTOP_ID, TaskID, (int)Status); // optimized overload for this exists } [Event(TRACESYNCHRONOUSWORKSTART_ID, Version = 1, @@ -485,7 +485,7 @@ namespace System.Threading.Tasks public void TraceSynchronousWorkBegin(int TaskID, CausalitySynchronousWork Work) { if (IsEnabled() && IsEnabled(EventLevel.Informational, Keywords.AsyncCausalitySynchronousWork)) - WriteEvent(TRACESYNCHRONOUSWORKSTART_ID, TaskID, (int)Work); // optmized overload for this exists + WriteEvent(TRACESYNCHRONOUSWORKSTART_ID, TaskID, (int)Work); // optimized overload for this exists } [Event(TRACESYNCHRONOUSWORKSTOP_ID, Version = 1, @@ -573,7 +573,7 @@ namespace System.Threading.Tasks // The thread pool generated a process wide unique GUID from a task GUID by // using the taskGuid, the appdomain ID, and 8 bytes of 'randomization' chosen by // using the last 8 bytes as the provider GUID for this provider. - // These were generated by CreateGuid, and are reasonably random (and thus unlikley to collide + // These were generated by CreateGuid, and are reasonably random (and thus unlikely to collide uint pid = EventSource.s_currentPid; return new Guid(taskID, (short)DefaultAppDomainID, (short)(DefaultAppDomainID >> 16), |