ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
benaadams wants to merge 8 commits into from
Closed

ThreadPool Blocking Mitigation #47366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33933bd
ThreadPool Blocking Mitigation
benaadams Jan 22, 2021
1aab959
Add test
benaadams Jan 24, 2021
7db0ee4
Signal the ThreadPool when executing new items
benaadams Jan 24, 2021
0604381
Apply suggestions from code review
benaadams Jan 25, 2021
3309b99
Use common workitem Run method
benaadams Jan 25, 2021
a2ee135
Use virtual for QUWI
benaadams Jan 27, 2021
715d3f9
Requesting threads allows ThreadCount - 1
benaadams Jan 27, 2021
0079975
Allow switching off blocking
benaadams Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
return GetType().GetHashCode();
}

protected virtual MethodInfo GetMethodImpl()
protected internal virtual MethodInfo GetMethodImpl()
{
if ((_methodBase == null) || !(_methodBase is MethodInfo))
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
return base.GetTarget();
}

protected override MethodInfo GetMethodImpl()
protected internal override MethodInfo GetMethodImpl()
{
if (_invocationCount != (IntPtr)0 && _invocationList != null)
{
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down
5 changes: 5 additions & 0 deletions src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
bool returnValue = SpinWait(millisecondsTimeout);
if (!returnValue)
{
if (Thread.CurrentThread.IsThreadPoolThread)
{
ThreadPool.RecordBlockingCallsite();
}

var mres = new SetOnInvokeMres();
try
{
Expand Down
115 changes: 77 additions & 38 deletions src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

if (ThreadPoolBlockingQueue.IsEnabled &&
ThreadPoolBlockingQueue.RequiresMitigation(callback))
{
callback = ThreadPoolBlockingQueue.Enqueue(callback);
forceGlobal = true;
}

ThreadPoolWorkQueueThreadLocals? tl = null;
if (!forceGlobal)
tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
}
}

if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

//
// If we found work, there may be more work. Ask for another thread so that the other work can be processed
// in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
//
workQueue.EnsureThreadRequested();

//
// Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
//
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
if (ThreadPool.EnableWorkerTracking)
{
DispatchWorkItemWithWorkerTracking(workItem, currentThread);
}
else if (workItem is Task task)
{
// Check for Task first as it's currently faster to type check
// for Task and then Unsafe.As for the interface, rather than
// vice versa, in particular when the object implements a bunch
// of interfaces.
task.ExecuteFromThreadPool(currentThread);
}
else
{
Debug.Assert(workItem is IThreadPoolWorkItem);
Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
}
#pragma warning restore CS0162
workQueue.RunWorkItem(currentThread, workItem);

// Release refs
workItem = null;

// Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
// change notifications).
ExecutionContext.ResetThreadPoolThread(currentThread);

// Reset thread state after all user code for the work item has completed
currentThread.ResetThreadPoolThread();
if (ThreadPoolBlockingQueue.IsEnabled)
{
ThreadPoolBlockingQueue.ClearRegistration();
}

//
// Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
}
}

internal void RunWorkItem(Thread currentThread, object workItem)
{
if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

//
// If we found work, there may be more work. Ask for another thread so that the other work can be processed
// in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
//
EnsureThreadRequested();

if (ThreadPoolBlockingQueue.IsEnabled)
{
if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
{
workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
}
else
{
ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
}
}

//
// Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
//
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
if (ThreadPool.EnableWorkerTracking)
{
DispatchWorkItemWithWorkerTracking(workItem, currentThread);
}
else if (workItem is Task task)
{
// Check for Task first as it's currently faster to type check
// for Task and then Unsafe.As for the interface, rather than
// vice versa, in particular when the object implements a bunch
// of interfaces.
task.ExecuteFromThreadPool(currentThread);
}
else
{
Debug.Assert(workItem is IThreadPoolWorkItem);
Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
}
#pragma warning restore CS0162

// Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
// change notifications).
ExecutionContext.ResetThreadPoolThread(currentThread);

// Reset thread state after all user code for the work item has completed
currentThread.ResetThreadPoolThread();
}

[MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
{
Debug.Assert(ThreadPool.EnableWorkerTracking);
Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
{
public abstract Delegate? Callback { get; }

#if DEBUG
private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
_context = context;
}

public override Delegate? Callback => _callback;

public override void Execute()
{
base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
_context = context;
}

public override Delegate? Callback => _callback;

public override void Execute()
{
base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
_state = state;
}

public override Delegate? Callback => _callback;

public override void Execute()
{
ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
_state = state;
}

public override Delegate? Callback => _callback;

public override void Execute()
{
ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

benaadams
wants to merge
8
commits into

from

 Closed


ThreadPool Blocking Mitigation
#47366
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
33933bd

ThreadPool Blocking Mitigation


benaadams Jan 22, 2021
1aab959

Add test


benaadams Jan 24, 2021
7db0ee4

Signal the ThreadPool when executing new items


benaadams Jan 24, 2021
0604381

Apply suggestions from code review


benaadams Jan 25, 2021
3309b99

Use common workitem Run method


benaadams Jan 25, 2021
a2ee135

Use virtual for QUWI


benaadams Jan 27, 2021
715d3f9

Requesting threads allows ThreadCount - 1


benaadams Jan 27, 2021
0079975

Allow switching off blocking


benaadams Jan 27, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
 return GetType().GetHashCode();
 }

 protected virtual MethodInfo GetMethodImpl()
 protected internal virtual MethodInfo GetMethodImpl()
 {
 if ((_methodBase == null) || !(_methodBase is MethodInfo))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
 return base.GetTarget();
 }

 protected override MethodInfo GetMethodImpl()
 protected internal override MethodInfo GetMethodImpl()
 {
 if (_invocationCount != (IntPtr)0 && _invocationList != null)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
 bool returnValue = SpinWait(millisecondsTimeout);
 if (!returnValue)
 {
 if (Thread.CurrentThread.IsThreadPoolThread)
 {
 ThreadPool.RecordBlockingCallsite();
 }

 var mres = new SetOnInvokeMres();
 try
 {
Expand Down

115 changes: 77 additions & 38 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

 if (ThreadPoolBlockingQueue.IsEnabled &&
 ThreadPoolBlockingQueue.RequiresMitigation(callback))
 {
 callback = ThreadPoolBlockingQueue.Enqueue(callback);
 forceGlobal = true;
 }

 ThreadPoolWorkQueueThreadLocals? tl = null;
 if (!forceGlobal)
 tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
 }
 }

 if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 workQueue.EnsureThreadRequested();

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162
 workQueue.RunWorkItem(currentThread, workItem);

 // Release refs
 workItem = null;

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 ThreadPoolBlockingQueue.ClearRegistration();
 }

 //
 // Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
 }
 }

 internal void RunWorkItem(Thread currentThread, object workItem)
 {
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 EnsureThreadRequested();

 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
 {
 workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
 }
 else
 {
 ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
 }
 }

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
 {
 Debug.Assert(ThreadPool.EnableWorkerTracking);
 Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

 internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
 {
 public abstract Delegate? Callback { get; }

#if DEBUG
 private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

benaadams
wants to merge
8
commits into

from

 Closed


ThreadPool Blocking Mitigation
#47366
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
33933bd

ThreadPool Blocking Mitigation


benaadams Jan 22, 2021
1aab959

Add test


benaadams Jan 24, 2021
7db0ee4

Signal the ThreadPool when executing new items


benaadams Jan 24, 2021
0604381

Apply suggestions from code review


benaadams Jan 25, 2021
3309b99

Use common workitem Run method


benaadams Jan 25, 2021
a2ee135

Use virtual for QUWI


benaadams Jan 27, 2021
715d3f9

Requesting threads allows ThreadCount - 1


benaadams Jan 27, 2021
0079975

Allow switching off blocking


benaadams Jan 27, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
 return GetType().GetHashCode();
 }

 protected virtual MethodInfo GetMethodImpl()
 protected internal virtual MethodInfo GetMethodImpl()
 {
 if ((_methodBase == null) || !(_methodBase is MethodInfo))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
 return base.GetTarget();
 }

 protected override MethodInfo GetMethodImpl()
 protected internal override MethodInfo GetMethodImpl()
 {
 if (_invocationCount != (IntPtr)0 && _invocationList != null)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
 bool returnValue = SpinWait(millisecondsTimeout);
 if (!returnValue)
 {
 if (Thread.CurrentThread.IsThreadPoolThread)
 {
 ThreadPool.RecordBlockingCallsite();
 }

 var mres = new SetOnInvokeMres();
 try
 {
Expand Down

115 changes: 77 additions & 38 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

 if (ThreadPoolBlockingQueue.IsEnabled &&
 ThreadPoolBlockingQueue.RequiresMitigation(callback))
 {
 callback = ThreadPoolBlockingQueue.Enqueue(callback);
 forceGlobal = true;
 }

 ThreadPoolWorkQueueThreadLocals? tl = null;
 if (!forceGlobal)
 tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
 }
 }

 if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 workQueue.EnsureThreadRequested();

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162
 workQueue.RunWorkItem(currentThread, workItem);

 // Release refs
 workItem = null;

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 ThreadPoolBlockingQueue.ClearRegistration();
 }

 //
 // Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
 }
 }

 internal void RunWorkItem(Thread currentThread, object workItem)
 {
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 EnsureThreadRequested();

 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
 {
 workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
 }
 else
 {
 ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
 }
 }

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
 {
 Debug.Assert(ThreadPool.EnableWorkerTracking);
 Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

 internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
 {
 public abstract Delegate? Callback { get; }

#if DEBUG
 private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

benaadams
wants to merge
8
commits into

from

 Closed


ThreadPool Blocking Mitigation
#47366
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
33933bd

ThreadPool Blocking Mitigation


benaadams Jan 22, 2021
1aab959

Add test


benaadams Jan 24, 2021
7db0ee4

Signal the ThreadPool when executing new items


benaadams Jan 24, 2021
0604381

Apply suggestions from code review


benaadams Jan 25, 2021
3309b99

Use common workitem Run method


benaadams Jan 25, 2021
a2ee135

Use virtual for QUWI


benaadams Jan 27, 2021
715d3f9

Requesting threads allows ThreadCount - 1


benaadams Jan 27, 2021
0079975

Allow switching off blocking


benaadams Jan 27, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
 return GetType().GetHashCode();
 }

 protected virtual MethodInfo GetMethodImpl()
 protected internal virtual MethodInfo GetMethodImpl()
 {
 if ((_methodBase == null) || !(_methodBase is MethodInfo))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
 return base.GetTarget();
 }

 protected override MethodInfo GetMethodImpl()
 protected internal override MethodInfo GetMethodImpl()
 {
 if (_invocationCount != (IntPtr)0 && _invocationList != null)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
 bool returnValue = SpinWait(millisecondsTimeout);
 if (!returnValue)
 {
 if (Thread.CurrentThread.IsThreadPoolThread)
 {
 ThreadPool.RecordBlockingCallsite();
 }

 var mres = new SetOnInvokeMres();
 try
 {
Expand Down

115 changes: 77 additions & 38 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

 if (ThreadPoolBlockingQueue.IsEnabled &&
 ThreadPoolBlockingQueue.RequiresMitigation(callback))
 {
 callback = ThreadPoolBlockingQueue.Enqueue(callback);
 forceGlobal = true;
 }

 ThreadPoolWorkQueueThreadLocals? tl = null;
 if (!forceGlobal)
 tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
 }
 }

 if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 workQueue.EnsureThreadRequested();

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162
 workQueue.RunWorkItem(currentThread, workItem);

 // Release refs
 workItem = null;

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 ThreadPoolBlockingQueue.ClearRegistration();
 }

 //
 // Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
 }
 }

 internal void RunWorkItem(Thread currentThread, object workItem)
 {
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 EnsureThreadRequested();

 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
 {
 workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
 }
 else
 {
 ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
 }
 }

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
 {
 Debug.Assert(ThreadPool.EnableWorkerTracking);
 Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

 internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
 {
 public abstract Delegate? Callback { get; }

#if DEBUG
 private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

benaadams
wants to merge
8
commits into

from

 Closed


ThreadPool Blocking Mitigation
#47366
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
33933bd

ThreadPool Blocking Mitigation


benaadams Jan 22, 2021
1aab959

Add test


benaadams Jan 24, 2021
7db0ee4

Signal the ThreadPool when executing new items


benaadams Jan 24, 2021
0604381

Apply suggestions from code review


benaadams Jan 25, 2021
3309b99

Use common workitem Run method


benaadams Jan 25, 2021
a2ee135

Use virtual for QUWI


benaadams Jan 27, 2021
715d3f9

Requesting threads allows ThreadCount - 1


benaadams Jan 27, 2021
0079975

Allow switching off blocking


benaadams Jan 27, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
 return GetType().GetHashCode();
 }

 protected virtual MethodInfo GetMethodImpl()
 protected internal virtual MethodInfo GetMethodImpl()
 {
 if ((_methodBase == null) || !(_methodBase is MethodInfo))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
 return base.GetTarget();
 }

 protected override MethodInfo GetMethodImpl()
 protected internal override MethodInfo GetMethodImpl()
 {
 if (_invocationCount != (IntPtr)0 && _invocationList != null)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
 bool returnValue = SpinWait(millisecondsTimeout);
 if (!returnValue)
 {
 if (Thread.CurrentThread.IsThreadPoolThread)
 {
 ThreadPool.RecordBlockingCallsite();
 }

 var mres = new SetOnInvokeMres();
 try
 {
Expand Down

115 changes: 77 additions & 38 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

 if (ThreadPoolBlockingQueue.IsEnabled &&
 ThreadPoolBlockingQueue.RequiresMitigation(callback))
 {
 callback = ThreadPoolBlockingQueue.Enqueue(callback);
 forceGlobal = true;
 }

 ThreadPoolWorkQueueThreadLocals? tl = null;
 if (!forceGlobal)
 tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
 }
 }

 if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 workQueue.EnsureThreadRequested();

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162
 workQueue.RunWorkItem(currentThread, workItem);

 // Release refs
 workItem = null;

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 ThreadPoolBlockingQueue.ClearRegistration();
 }

 //
 // Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
 }
 }

 internal void RunWorkItem(Thread currentThread, object workItem)
 {
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 EnsureThreadRequested();

 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
 {
 workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
 }
 else
 {
 ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
 }
 }

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
 {
 Debug.Assert(ThreadPool.EnableWorkerTracking);
 Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

 internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
 {
 public abstract Delegate? Callback { get; }

#if DEBUG
 private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

benaadams
wants to merge
8
commits into

from

 Closed


ThreadPool Blocking Mitigation
#47366
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
33933bd

ThreadPool Blocking Mitigation


benaadams Jan 22, 2021
1aab959

Add test


benaadams Jan 24, 2021
7db0ee4

Signal the ThreadPool when executing new items


benaadams Jan 24, 2021
0604381

Apply suggestions from code review


benaadams Jan 25, 2021
3309b99

Use common workitem Run method


benaadams Jan 25, 2021
a2ee135

Use virtual for QUWI


benaadams Jan 27, 2021
715d3f9

Requesting threads allows ThreadCount - 1


benaadams Jan 27, 2021
0079975

Allow switching off blocking


benaadams Jan 27, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
 return GetType().GetHashCode();
 }

 protected virtual MethodInfo GetMethodImpl()
 protected internal virtual MethodInfo GetMethodImpl()
 {
 if ((_methodBase == null) || !(_methodBase is MethodInfo))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
 return base.GetTarget();
 }

 protected override MethodInfo GetMethodImpl()
 protected internal override MethodInfo GetMethodImpl()
 {
 if (_invocationCount != (IntPtr)0 && _invocationList != null)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
 bool returnValue = SpinWait(millisecondsTimeout);
 if (!returnValue)
 {
 if (Thread.CurrentThread.IsThreadPoolThread)
 {
 ThreadPool.RecordBlockingCallsite();
 }

 var mres = new SetOnInvokeMres();
 try
 {
Expand Down

115 changes: 77 additions & 38 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

 if (ThreadPoolBlockingQueue.IsEnabled &&
 ThreadPoolBlockingQueue.RequiresMitigation(callback))
 {
 callback = ThreadPoolBlockingQueue.Enqueue(callback);
 forceGlobal = true;
 }

 ThreadPoolWorkQueueThreadLocals? tl = null;
 if (!forceGlobal)
 tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
 }
 }

 if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 workQueue.EnsureThreadRequested();

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162
 workQueue.RunWorkItem(currentThread, workItem);

 // Release refs
 workItem = null;

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 ThreadPoolBlockingQueue.ClearRegistration();
 }

 //
 // Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
 }
 }

 internal void RunWorkItem(Thread currentThread, object workItem)
 {
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 EnsureThreadRequested();

 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
 {
 workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
 }
 else
 {
 ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
 }
 }

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
 {
 Debug.Assert(ThreadPool.EnableWorkerTracking);
 Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

 internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
 {
 public abstract Delegate? Callback { get; }

#if DEBUG
 private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

benaadams
wants to merge
8
commits into

from

 Closed


ThreadPool Blocking Mitigation
#47366
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
33933bd

ThreadPool Blocking Mitigation


benaadams Jan 22, 2021
1aab959

Add test


benaadams Jan 24, 2021
7db0ee4

Signal the ThreadPool when executing new items


benaadams Jan 24, 2021
0604381

Apply suggestions from code review


benaadams Jan 25, 2021
3309b99

Use common workitem Run method


benaadams Jan 25, 2021
a2ee135

Use virtual for QUWI


benaadams Jan 27, 2021
715d3f9

Requesting threads allows ThreadCount - 1


benaadams Jan 27, 2021
0079975

Allow switching off blocking


benaadams Jan 27, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
 return GetType().GetHashCode();
 }

 protected virtual MethodInfo GetMethodImpl()
 protected internal virtual MethodInfo GetMethodImpl()
 {
 if ((_methodBase == null) || !(_methodBase is MethodInfo))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
 return base.GetTarget();
 }

 protected override MethodInfo GetMethodImpl()
 protected internal override MethodInfo GetMethodImpl()
 {
 if (_invocationCount != (IntPtr)0 && _invocationList != null)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
 bool returnValue = SpinWait(millisecondsTimeout);
 if (!returnValue)
 {
 if (Thread.CurrentThread.IsThreadPoolThread)
 {
 ThreadPool.RecordBlockingCallsite();
 }

 var mres = new SetOnInvokeMres();
 try
 {
Expand Down

115 changes: 77 additions & 38 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

 if (ThreadPoolBlockingQueue.IsEnabled &&
 ThreadPoolBlockingQueue.RequiresMitigation(callback))
 {
 callback = ThreadPoolBlockingQueue.Enqueue(callback);
 forceGlobal = true;
 }

 ThreadPoolWorkQueueThreadLocals? tl = null;
 if (!forceGlobal)
 tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
 }
 }

 if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 workQueue.EnsureThreadRequested();

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162
 workQueue.RunWorkItem(currentThread, workItem);

 // Release refs
 workItem = null;

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 ThreadPoolBlockingQueue.ClearRegistration();
 }

 //
 // Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
 }
 }

 internal void RunWorkItem(Thread currentThread, object workItem)
 {
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 EnsureThreadRequested();

 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
 {
 workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
 }
 else
 {
 ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
 }
 }

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
 {
 Debug.Assert(ThreadPool.EnableWorkerTracking);
 Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

 internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
 {
 public abstract Delegate? Callback { get; }

#if DEBUG
 private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ThreadPool Blocking Mitigation#47366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

benaadams
wants to merge
8
commits into

from

 Closed


ThreadPool Blocking Mitigation
#47366
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
33933bd

ThreadPool Blocking Mitigation


benaadams Jan 22, 2021
1aab959

Add test


benaadams Jan 24, 2021
7db0ee4

Signal the ThreadPool when executing new items


benaadams Jan 24, 2021
0604381

Apply suggestions from code review


benaadams Jan 25, 2021
3309b99

Use common workitem Run method


benaadams Jan 25, 2021
a2ee135

Use virtual for QUWI


benaadams Jan 27, 2021
715d3f9

Requesting threads allows ThreadCount - 1


benaadams Jan 27, 2021
0079975

Allow switching off blocking


benaadams Jan 27, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/Delegate.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ public override int GetHashCode()
 return GetType().GetHashCode();
 }

 protected virtual MethodInfo GetMethodImpl()
 protected internal virtual MethodInfo GetMethodImpl()
 {
 if ((_methodBase == null) || !(_methodBase is MethodInfo))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -523,7 +523,7 @@ public sealed override int GetHashCode()
 return base.GetTarget();
 }

 protected override MethodInfo GetMethodImpl()
 protected internal override MethodInfo GetMethodImpl()
 {
 if (_invocationCount != (IntPtr)0 && _invocationList != null)
 {
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1013,6 +1013,8 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadInterruptedException.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadLocal.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.AnyOS.cs" Condition="'$(TargetsBrowser)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPoolBlockingQueue.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPriority.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStart.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadStartException.cs" />
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2851,6 +2851,11 @@ private bool SpinThenBlockingWait(int millisecondsTimeout, CancellationToken can
 bool returnValue = SpinWait(millisecondsTimeout);
 if (!returnValue)
 {
 if (Thread.CurrentThread.IsThreadPoolThread)
 {
 ThreadPool.RecordBlockingCallsite();
 }

 var mres = new SetOnInvokeMres();
 try
 {
Expand Down

115 changes: 77 additions & 38 deletions
src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,6 +514,13 @@ public void Enqueue(object callback, bool forceGlobal)
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolEnqueueWorkObject(callback);

 if (ThreadPoolBlockingQueue.IsEnabled &&
 ThreadPoolBlockingQueue.RequiresMitigation(callback))
 {
 callback = ThreadPoolBlockingQueue.Enqueue(callback);
 forceGlobal = true;
 }

 ThreadPoolWorkQueueThreadLocals? tl = null;
 if (!forceGlobal)
 tl = ThreadPoolWorkQueueThreadLocals.threadLocals;
Expand DownExpand Up@@ -679,47 +686,15 @@ internal static bool Dispatch()
 }
 }

 if (workQueue.loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 workQueue.EnsureThreadRequested();

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162
 workQueue.RunWorkItem(currentThread, workItem);

 // Release refs
 workItem = null;

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 ThreadPoolBlockingQueue.ClearRegistration();
 }

 //
 // Notify the VM that we executed this workitem. This is also our opportunity to ask whether Hill Climbing wants
Expand DownExpand Up@@ -770,8 +745,62 @@ internal static bool Dispatch()
 }
 }

 internal void RunWorkItem(Thread currentThread, object workItem)
 {
 if (loggingEnabled && FrameworkEventSource.Log.IsEnabled())
 FrameworkEventSource.Log.ThreadPoolDequeueWorkObject(workItem);

 //
 // If we found work, there may be more work. Ask for another thread so that the other work can be processed
 // in parallel. Note that this will only ask for a max of #procs threads, so it's safe to call it for every dequeue.
 //
 EnsureThreadRequested();

 if (ThreadPoolBlockingQueue.IsEnabled)
 {
 if (ThreadPoolBlockingQueue.RequiresMitigation(workItem))
 {
 workItem = ThreadPoolBlockingQueue.Enqueue(workItem);
 }
 else
 {
 ThreadPoolBlockingQueue.RegisterForBlockingDetection(workItem);
 }
 }

 //
 // Execute the workitem outside of any finally blocks, so that it can be aborted if needed.
 //
#pragma warning disable CS0162 // Unreachable code detected. EnableWorkerTracking may be a constant in some runtimes.
 if (ThreadPool.EnableWorkerTracking)
 {
 DispatchWorkItemWithWorkerTracking(workItem, currentThread);
 }
 else if (workItem is Task task)
 {
 // Check for Task first as it's currently faster to type check
 // for Task and then Unsafe.As for the interface, rather than
 // vice versa, in particular when the object implements a bunch
 // of interfaces.
 task.ExecuteFromThreadPool(currentThread);
 }
 else
 {
 Debug.Assert(workItem is IThreadPoolWorkItem);
 Unsafe.As<IThreadPoolWorkItem>(workItem).Execute();
 }
#pragma warning restore CS0162

 // Return to clean ExecutionContext and SynchronizationContext. This may call user code (AsyncLocal value
 // change notifications).
 ExecutionContext.ResetThreadPoolThread(currentThread);

 // Reset thread state after all user code for the work item has completed
 currentThread.ResetThreadPoolThread();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
private static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
internal static void DispatchWorkItemWithWorkerTracking(object workItem, Thread currentThread)
 {
 Debug.Assert(ThreadPool.EnableWorkerTracking);
 Debug.Assert(currentThread == Thread.CurrentThread);
Expand DownExpand Up@@ -846,6 +875,8 @@ public ThreadPoolWorkQueueThreadLocals(ThreadPoolWorkQueue tpq)

 internal abstract class QueueUserWorkItemCallbackBase : IThreadPoolWorkItem
 {
 public abstract Delegate? Callback { get; }

#if DEBUG
 private int executed;

Expand DownExpand Up@@ -892,6 +923,8 @@ internal QueueUserWorkItemCallback(WaitCallback callback, object? state, Executi
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -915,6 +948,8 @@ internal QueueUserWorkItemCallback(Action<TState> callback, TState state, Execut
 _context = context;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 base.Execute();
Expand All@@ -940,6 +975,8 @@ internal QueueUserWorkItemCallbackDefaultContext(WaitCallback callback, object?
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand DownExpand Up@@ -968,6 +1005,8 @@ internal QueueUserWorkItemCallbackDefaultContext(Action<TState> callback, TState
 _state = state;
 }

 public override Delegate? Callback => _callback;

 public override void Execute()
 {
 ExecutionContext.CheckThreadPoolAndContextsAreDefault();
Expand Down
Loading