diff options
| -rw-r--r-- | src/System.Private.CoreLib/System.Private.CoreLib.csproj | 7 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems | 7 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/CancellationTokenRegistration.cs (renamed from src/System.Private.CoreLib/src/System/Threading/CancellationTokenRegistration.cs) | 4 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/CancellationTokenSource.cs (renamed from src/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs) | 6 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/Tasks/Future.cs (renamed from src/System.Private.CoreLib/src/System/Threading/Tasks/future.cs) | 6 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/Tasks/ProducerConsumerQueues.cs (renamed from src/System.Private.CoreLib/src/System/Threading/Tasks/ProducerConsumerQueues.cs) | 0 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/Tasks/TaskExceptionHolder.cs (renamed from src/System.Private.CoreLib/src/System/Threading/Tasks/TaskExceptionHolder.cs) | 49 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/Tasks/TaskScheduler.cs (renamed from src/System.Private.CoreLib/src/System/Threading/Tasks/TaskScheduler.cs) | 52 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/Tasks/ThreadPoolTaskScheduler.cs (renamed from src/System.Private.CoreLib/src/System/Threading/Tasks/ThreadPoolTaskScheduler.cs) | 4 |
9 files changed, 29 insertions, 106 deletions
diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 126c62608f..18de69be17 100644 --- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -317,8 +317,6 @@ <Compile Include="$(BclSourcesRoot)\System\Text\EncodingTable.cs" Condition="'$(FeatureCoreFxGlobalization)' != 'true'" /> <Compile Include="$(BclSourcesRoot)\System\Text\EncodingTable.Unix.cs" Condition="'$(FeatureCoreFxGlobalization)' == 'true'" /> <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\CancellationTokenRegistration.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\CancellationTokenSource.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" /> @@ -327,15 +325,10 @@ <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\SynchronizationContext.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\AsyncCausalityTracer.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\future.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\FutureFactory.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\ProducerConsumerQueues.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\Task.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskContinuation.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskExceptionHolder.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskFactory.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskScheduler.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\ThreadPoolTaskScheduler.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TPLETWProvider.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.cs" /> 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 397853e3da..96c5b52f68 100644 --- a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems @@ -676,6 +676,8 @@ <Compile Include="$(MSBuildThisFileDirectory)System\Threading\AsyncLocal.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\AutoResetEvent.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\CancellationToken.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Threading\CancellationTokenRegistration.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Threading\CancellationTokenSource.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\DeferredDisposableLifetime.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\EventResetMode.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\EventWaitHandle.cs" /> @@ -698,11 +700,16 @@ <Compile Include="$(MSBuildThisFileDirectory)System\Threading\SynchronizationLockException.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.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" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskCanceledException.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskCompletionSource.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskExceptionHolder.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskExtensions.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskToApm.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskScheduler.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskSchedulerException.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\ThreadPoolTaskScheduler.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\ValueTask.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\Sources\ManualResetValueTaskSourceCore.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\Sources\IValueTaskSource.cs" /> diff --git a/src/System.Private.CoreLib/src/System/Threading/CancellationTokenRegistration.cs b/src/System.Private.CoreLib/shared/System/Threading/CancellationTokenRegistration.cs index 232a4d1c25..bab2ce9c03 100644 --- a/src/System.Private.CoreLib/src/System/Threading/CancellationTokenRegistration.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/CancellationTokenRegistration.cs @@ -93,7 +93,7 @@ namespace System.Threading CancellationTokenSource source = _node.Partition.Source; if (source.IsCancellationRequested && // Running callbacks has commenced. !source.IsCancellationCompleted && // Running callbacks hasn't finished. - source.ThreadIDExecutingCallbacks != Thread.CurrentThread.ManagedThreadId) // The executing thread ID is not this thread's ID. + source.ThreadIDExecutingCallbacks != Environment.CurrentManagedThreadId) // The executing thread ID is not this thread's ID. { // Callback execution is in progress, the executing thread is different from this thread and has taken the callback for execution // so observe and wait until this target callback is no longer the executing callback. @@ -108,7 +108,7 @@ namespace System.Threading CancellationTokenSource source = _node.Partition.Source; if (source.IsCancellationRequested && // Running callbacks has commenced. !source.IsCancellationCompleted && // Running callbacks hasn't finished. - source.ThreadIDExecutingCallbacks != Thread.CurrentThread.ManagedThreadId) // The executing thread ID is not this thread's ID. + source.ThreadIDExecutingCallbacks != Environment.CurrentManagedThreadId) // The executing thread ID is not this thread's ID. { // Callback execution is in progress, the executing thread is different from this thread and has taken the callback for execution // so get a task that'll complete when this target callback is no longer the executing callback. diff --git a/src/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs b/src/System.Private.CoreLib/shared/System/Threading/CancellationTokenSource.cs index de9faa597e..937bbaf456 100644 --- a/src/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/CancellationTokenSource.cs @@ -595,7 +595,7 @@ namespace System.Threading Debug.Assert(IsCancellationRequested, "ExecuteCallbackHandlers should only be called after setting IsCancellationRequested->true"); // Record the threadID being used for running the callbacks. - ThreadIDExecutingCallbacks = Thread.CurrentThread.ManagedThreadId; + ThreadIDExecutingCallbacks = Environment.CurrentManagedThreadId; // If there are no callbacks to run, we can safely exit. Any race conditions to lazy initialize it // will see IsCancellationRequested and will then run the callback themselves. @@ -669,10 +669,10 @@ namespace System.Threading node.SynchronizationContext.Send(s => { var n = (CallbackNode)s; - n.Partition.Source.ThreadIDExecutingCallbacks = Thread.CurrentThread.ManagedThreadId; + n.Partition.Source.ThreadIDExecutingCallbacks = Environment.CurrentManagedThreadId; n.ExecuteCallback(); }, node); - ThreadIDExecutingCallbacks = Thread.CurrentThread.ManagedThreadId; // above may have altered ThreadIDExecutingCallbacks, so reset it + ThreadIDExecutingCallbacks = Environment.CurrentManagedThreadId; // above may have altered ThreadIDExecutingCallbacks, so reset it } else { diff --git a/src/System.Private.CoreLib/src/System/Threading/Tasks/future.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/Future.cs index 86a6af7897..e3339efd42 100644 --- a/src/System.Private.CoreLib/src/System/Threading/Tasks/future.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/Future.cs @@ -10,14 +10,10 @@ // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -using System; using System.Collections.Generic; -using System.Runtime; +using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; -using System.Security; -using System.Threading; -using System.Diagnostics; // Disable the "reference to volatile field not treated as volatile" error. #pragma warning disable 0420 diff --git a/src/System.Private.CoreLib/src/System/Threading/Tasks/ProducerConsumerQueues.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/ProducerConsumerQueues.cs index 1880288c51..1880288c51 100644 --- a/src/System.Private.CoreLib/src/System/Threading/Tasks/ProducerConsumerQueues.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/ProducerConsumerQueues.cs diff --git a/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskExceptionHolder.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TaskExceptionHolder.cs index 5f2ce58bef..0037923bdb 100644 --- a/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskExceptionHolder.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TaskExceptionHolder.cs @@ -57,34 +57,8 @@ namespace System.Threading.Tasks /// </summary> ~TaskExceptionHolder() { - // Raise unhandled exceptions only when we know that neither the process or nor the appdomain is being torn down. - // We need to do this filtering because all TaskExceptionHolders will be finalized during shutdown or unload - // regardles of reachability of the task (i.e. even if the user code was about to observe the task's exception), - // which can otherwise lead to spurious crashes during shutdown. - if (m_faultExceptions != null && !m_isHandled && !Environment.HasShutdownStarted) + if (m_faultExceptions != null && !m_isHandled) { - // We don't want to crash the finalizer thread if any ThreadAbortExceptions - // occur in the list or in any nested AggregateExceptions. - // (Don't rethrow ThreadAbortExceptions.) - foreach (ExceptionDispatchInfo edi in m_faultExceptions) - { - var exp = edi.SourceException; - AggregateException aggExp = exp as AggregateException; - if (aggExp != null) - { - AggregateException flattenedAggExp = aggExp.Flatten(); - foreach (Exception innerExp in flattenedAggExp.InnerExceptions) - { - if (innerExp is ThreadAbortException) - return; - } - } - else if (exp is ThreadAbortException) - { - return; - } - } - // We will only propagate if this is truly unhandled. The reason this could // ever occur is somewhat subtle: if a Task's exceptions are observed in some // other finalizer, and the Task was finalized before the holder, the holder @@ -239,25 +213,8 @@ namespace System.Threading.Tasks } } - - // If all of the exceptions are ThreadAbortExceptions and/or - // AppDomainUnloadExceptions, we do not want the finalization - // probe to propagate them, so we consider the holder to be - // handled. If a subsequent exception comes in of a different - // kind, we will reactivate the holder. - for (int i = 0; i < exceptions.Count; i++) - { - var t = exceptions[i].SourceException.GetType(); - if (t != typeof(ThreadAbortException)) - { - MarkAsUnhandled(); - break; - } - else if (i == exceptions.Count - 1) - { - MarkAsHandled(false); - } - } + if (exceptions.Count > 0) + MarkAsUnhandled(); } /// <summary> diff --git a/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskScheduler.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TaskScheduler.cs index 8c929eb1ea..c5bf02b9bc 100644 --- a/src/System.Private.CoreLib/src/System/Threading/Tasks/TaskScheduler.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TaskScheduler.cs @@ -12,12 +12,7 @@ // Disable the "reference to volatile field not treated as volatile" error. #pragma warning disable 0420 -using System; using System.Collections.Generic; -using System.Globalization; -using System.Threading; -using System.Security; -using System.Collections.Concurrent; using System.Diagnostics; using System.Runtime.CompilerServices; @@ -202,10 +197,12 @@ namespace System.Threading.Tasks bool bInlined = false; try { +#if CORECLR if (TplEtwProvider.Log.IsEnabled()) { task.FireTaskScheduledIfNeeded(this); } +#endif bInlined = TryExecuteTaskInline(task, taskWasPreviouslyQueued); } finally @@ -258,10 +255,12 @@ namespace System.Threading.Tasks { Debug.Assert(task != null); +#if CORECLR if (TplEtwProvider.Log.IsEnabled()) { task.FireTaskScheduledIfNeeded(this); } +#endif this.QueueTask(task); } @@ -296,6 +295,7 @@ namespace System.Threading.Tasks /// </summary> protected TaskScheduler() { +#if CORECLR // Debugger support // Register the scheduler in the active scheduler list. This is only relevant when debugging, // so we only pay the cost if the debugger is attached when the scheduler is created. This // means that the internal TaskScheduler.GetTaskSchedulersForDebugger() will only include @@ -304,6 +304,7 @@ namespace System.Threading.Tasks { AddToActiveTaskSchedulers(); } +#endif } /// <summary>Adds this scheduler ot the active schedulers tracking collection for debugging purposes.</summary> @@ -453,9 +454,6 @@ namespace System.Threading.Tasks // Events // - private static EventHandler<UnobservedTaskExceptionEventArgs> _unobservedTaskException; - private static readonly object _unobservedTaskExceptionLockObject = new object(); - /// <summary> /// Occurs when a faulted <see cref="System.Threading.Tasks.Task"/>'s unobserved exception is about to trigger exception escalation /// policy, which, by default, would terminate the process. @@ -466,27 +464,7 @@ namespace System.Threading.Tasks /// Each handler is passed a <see cref="T:System.Threading.Tasks.UnobservedTaskExceptionEventArgs"/> /// instance, which may be used to examine the exception and to mark it as observed. /// </remarks> - public static event EventHandler<UnobservedTaskExceptionEventArgs> UnobservedTaskException - { - add - { - if (value != null) - { - RuntimeHelpers.PrepareContractedDelegate(value); - lock (_unobservedTaskExceptionLockObject) _unobservedTaskException += value; - } - } - - remove - { - lock (_unobservedTaskExceptionLockObject) _unobservedTaskException -= value; - } - } - - - - - + public static event EventHandler<UnobservedTaskExceptionEventArgs> UnobservedTaskException; //////////////////////////////////////////////////////////// // @@ -496,17 +474,7 @@ namespace System.Threading.Tasks // This is called by the TaskExceptionHolder finalizer. internal static void PublishUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs ueea) { - // Lock this logic to prevent just-unregistered handlers from being called. - lock (_unobservedTaskExceptionLockObject) - { - // Since we are under lock, it is technically no longer necessary - // to make a copy. It is done here for convenience. - EventHandler<UnobservedTaskExceptionEventArgs> handler = _unobservedTaskException; - if (handler != null) - { - handler(sender, ueea); - } - } + UnobservedTaskException?.Invoke(sender, ueea); } /// <summary> @@ -597,13 +565,13 @@ namespace System.Threading.Tasks m_taskScheduler = scheduler; } - // returns the scheduler�s Id + // returns the scheduler's Id public int Id { get { return m_taskScheduler.Id; } } - // returns the scheduler�s GetScheduledTasks + // returns the scheduler's GetScheduledTasks public IEnumerable<Task> ScheduledTasks { get { return m_taskScheduler.GetScheduledTasks(); } diff --git a/src/System.Private.CoreLib/src/System/Threading/Tasks/ThreadPoolTaskScheduler.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/ThreadPoolTaskScheduler.cs index 9ab28ef34a..339a9d8fb5 100644 --- a/src/System.Private.CoreLib/src/System/Threading/Tasks/ThreadPoolTaskScheduler.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/ThreadPoolTaskScheduler.cs @@ -17,6 +17,8 @@ using System.Diagnostics; using System.Collections.Generic; using System.Text; +using Internal.Runtime.Augments; + namespace System.Threading.Tasks { /// <summary> @@ -45,7 +47,7 @@ namespace System.Threading.Tasks if ((options & TaskCreationOptions.LongRunning) != 0) { // Run LongRunning tasks on their own dedicated thread. - Thread thread = new Thread(s_longRunningThreadWork); + RuntimeThread thread = RuntimeThread.Create(s_longRunningThreadWork); thread.IsBackground = true; // Keep this thread from blocking process shutdown thread.Start(task); } |