Add support for Windows IO completions to the portable thread pool#64834

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

Merged
kouvel merged 13 commits into from
Mar 4, 2022
Merged

Add support for Windows IO completions to the portable thread pool #64834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
057ceed
Add support for Windows IO completions to the portable thread pool
Jan 8, 2022
37a66e0
Translate NtStatus codes to system error codes, fix some other failur…
Feb 7, 2022
3233ae0
Fix wasm build
Feb 7, 2022
7c0d7d5
Try to fix a time-sensitive test, enable some tests on Mono based on …
Feb 7, 2022
759e11a
Enable some more tests on Mono based on #34582
Feb 7, 2022
12f40a2
Miscellaneous fixes
Feb 8, 2022
0a2dc42
Temporarily enable libraries tests against Mono for this PR
Feb 8, 2022
64cca54
Try to fix a time-sensitive test that is occasionally failing
Feb 11, 2022
251de07
Note SOS usage of a variable
Feb 12, 2022
165842a
Address feedback
Feb 17, 2022
81f18f0
Revert "Temporarily enable libraries tests against Mono for this PR"
Feb 27, 2022
14893de
Fix build after rebase
Feb 27, 2022
a310f12
Add checks for some DOTNET vars from Net.Sockets and implement inlini…
Feb 27, 2022
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
6 changes: 1 addition & 5 deletions src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
<Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
<Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
<Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
<Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
</Compile>
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
</ItemGroup>
<ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down
28 changes: 2 additions & 26 deletions src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
#region class _IOCompletionCallback

internal unsafe class _IOCompletionCallback
internal unsafe partial class _IOCompletionCallback
{
private readonly IOCompletionCallback _ioCompletionCallback;
private readonly ExecutionContext _executionContext;
private uint _errorCode; // Error code
private uint _numBytes; // No. of bytes transferred
private NativeOverlapped* _pNativeOverlapped;

internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
{
_ioCompletionCallback = ioCompletionCallback;
_executionContext = executionContext;
}
// Context callback: same sig for SendOrPostCallback and ContextCallback
internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
internal static void IOCompletionCallback_Context(object? state)
{
_IOCompletionCallback? helper = (_IOCompletionCallback?)state;
Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
}

// call back helper
internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
{
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
helper._errorCode = errorCode;
helper._numBytes = numBytes;
helper._pNativeOverlapped = pNativeOverlapped;
ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
}

// Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
return AllocateNativeOverlapped();
}

internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

[MethodImpl(MethodImplOptions.InternalCall)]
private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
}

internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
}

#endregion class Overlapped
Expand Down
75 changes: 75 additions & 0 deletions src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
public static partial class ThreadPool
{
[CLSCompliant(false)]
[SupportedOSPlatform("windows")]
public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
{
if (overlapped == null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
}
Comment thread
kouvel marked this conversation as resolved.
Outdated

if (UsePortableThreadPoolForIO)
{
// OS doesn't signal handle, so do it here
overlapped->InternalLow = IntPtr.Zero;

PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
return true;
}

return PostQueuedCompletionStatus(overlapped);
}

[MethodImpl(MethodImplOptions.InternalCall)]
private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

[Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
[SupportedOSPlatform("windows")]
public static bool BindHandle(IntPtr osHandle)
{
if (UsePortableThreadPoolForIO)
{
PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
return true;
}

return BindIOCompletionCallbackNative(osHandle);
}

[SupportedOSPlatform("windows")]
public static bool BindHandle(SafeHandle osHandle!!)
{
bool mustReleaseSafeHandle = false;
try
{
osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

if (UsePortableThreadPoolForIO)
{
PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
return true;
}

return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
}
finally
{
if (mustReleaseSafeHandle)
osHandle.DangerousRelease();
}
}

[MethodImpl(MethodImplOptions.InternalCall)]
private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
}
}
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
Add support for Windows IO completions to the portable thread pool#64834

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

 Merged

kouvel
merged 13 commits into

from

Mar 4, 2022
 Merged


Add support for Windows IO completions to the portable thread pool
#64834
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
057ceed

Add support for Windows IO completions to the portable thread pool

Jan 8, 2022
37a66e0

Translate NtStatus codes to system error codes, fix some other failur…

Feb 7, 2022
3233ae0

Fix wasm build

Feb 7, 2022
7c0d7d5

Try to fix a time-sensitive test, enable some tests on Mono based on …

Feb 7, 2022
759e11a

Enable some more tests on Mono based on #34582

Feb 7, 2022
12f40a2

Miscellaneous fixes

Feb 8, 2022
0a2dc42

Temporarily enable libraries tests against Mono for this PR

Feb 8, 2022
64cca54

Try to fix a time-sensitive test that is occasionally failing

Feb 11, 2022
251de07

Note SOS usage of a variable

Feb 12, 2022
165842a

Address feedback

Feb 17, 2022
81f18f0

Revert "Temporarily enable libraries tests against Mono for this PR"

Feb 27, 2022
14893de

Fix build after rebase

Feb 27, 2022
a310f12

Add checks for some DOTNET vars from Net.Sockets and implement inlini…

Feb 27, 2022

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


6 changes: 1 addition & 5 deletions
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
 <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
 <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
 <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
 </Compile>
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down

28 changes: 2 additions & 26 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
 #region class _IOCompletionCallback

 internal unsafe class _IOCompletionCallback
 internal unsafe partial class _IOCompletionCallback
 {
 private readonly IOCompletionCallback _ioCompletionCallback;
 private readonly ExecutionContext _executionContext;
 private uint _errorCode; // Error code
 private uint _numBytes; // No. of bytes transferred
 private NativeOverlapped* _pNativeOverlapped;

 internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
 {
 _ioCompletionCallback = ioCompletionCallback;
 _executionContext = executionContext;
 }
 // Context callback: same sig for SendOrPostCallback and ContextCallback
 internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
 internal static void IOCompletionCallback_Context(object? state)
 {
 _IOCompletionCallback? helper = (_IOCompletionCallback?)state;
 Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
 helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
 }

 // call back helper
 internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
 {
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
 helper._errorCode = errorCode;
 helper._numBytes = numBytes;
 helper._pNativeOverlapped = pNativeOverlapped;
 ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
 ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
 }

 // Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
 return AllocateNativeOverlapped();
 }

 internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

 [MethodImpl(MethodImplOptions.InternalCall)]
 private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
 OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
 OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
 }

 internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
 }

 #endregion class Overlapped
Expand Down

75 changes: 75 additions & 0 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
 public static partial class ThreadPool
 {
 [CLSCompliant(false)]
 [SupportedOSPlatform("windows")]
 public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
 {
 if (overlapped == null)
 {
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
 }
Comment thread
kouvel marked this conversation as resolved.


Outdated


 if (UsePortableThreadPoolForIO)
 {
 // OS doesn't signal handle, so do it here
 overlapped->InternalLow = IntPtr.Zero;

 PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
 return true;
 }

 return PostQueuedCompletionStatus(overlapped);
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

 [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
 [SupportedOSPlatform("windows")]
 public static bool BindHandle(IntPtr osHandle)
 {
 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle);
 }

 [SupportedOSPlatform("windows")]
 public static bool BindHandle(SafeHandle osHandle!!)
 {
 bool mustReleaseSafeHandle = false;
 try
 {
 osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
 }
 finally
 {
 if (mustReleaseSafeHandle)
 osHandle.DangerousRelease();
 }
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
 }
}
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
Add support for Windows IO completions to the portable thread pool#64834

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

 Merged

kouvel
merged 13 commits into

from

Mar 4, 2022
 Merged


Add support for Windows IO completions to the portable thread pool
#64834
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
057ceed

Add support for Windows IO completions to the portable thread pool

Jan 8, 2022
37a66e0

Translate NtStatus codes to system error codes, fix some other failur…

Feb 7, 2022
3233ae0

Fix wasm build

Feb 7, 2022
7c0d7d5

Try to fix a time-sensitive test, enable some tests on Mono based on …

Feb 7, 2022
759e11a

Enable some more tests on Mono based on #34582

Feb 7, 2022
12f40a2

Miscellaneous fixes

Feb 8, 2022
0a2dc42

Temporarily enable libraries tests against Mono for this PR

Feb 8, 2022
64cca54

Try to fix a time-sensitive test that is occasionally failing

Feb 11, 2022
251de07

Note SOS usage of a variable

Feb 12, 2022
165842a

Address feedback

Feb 17, 2022
81f18f0

Revert "Temporarily enable libraries tests against Mono for this PR"

Feb 27, 2022
14893de

Fix build after rebase

Feb 27, 2022
a310f12

Add checks for some DOTNET vars from Net.Sockets and implement inlini…

Feb 27, 2022

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


6 changes: 1 addition & 5 deletions
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
 <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
 <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
 <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
 </Compile>
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down

28 changes: 2 additions & 26 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
 #region class _IOCompletionCallback

 internal unsafe class _IOCompletionCallback
 internal unsafe partial class _IOCompletionCallback
 {
 private readonly IOCompletionCallback _ioCompletionCallback;
 private readonly ExecutionContext _executionContext;
 private uint _errorCode; // Error code
 private uint _numBytes; // No. of bytes transferred
 private NativeOverlapped* _pNativeOverlapped;

 internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
 {
 _ioCompletionCallback = ioCompletionCallback;
 _executionContext = executionContext;
 }
 // Context callback: same sig for SendOrPostCallback and ContextCallback
 internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
 internal static void IOCompletionCallback_Context(object? state)
 {
 _IOCompletionCallback? helper = (_IOCompletionCallback?)state;
 Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
 helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
 }

 // call back helper
 internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
 {
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
 helper._errorCode = errorCode;
 helper._numBytes = numBytes;
 helper._pNativeOverlapped = pNativeOverlapped;
 ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
 ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
 }

 // Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
 return AllocateNativeOverlapped();
 }

 internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

 [MethodImpl(MethodImplOptions.InternalCall)]
 private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
 OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
 OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
 }

 internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
 }

 #endregion class Overlapped
Expand Down

75 changes: 75 additions & 0 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
 public static partial class ThreadPool
 {
 [CLSCompliant(false)]
 [SupportedOSPlatform("windows")]
 public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
 {
 if (overlapped == null)
 {
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
 }
Comment thread
kouvel marked this conversation as resolved.


Outdated


 if (UsePortableThreadPoolForIO)
 {
 // OS doesn't signal handle, so do it here
 overlapped->InternalLow = IntPtr.Zero;

 PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
 return true;
 }

 return PostQueuedCompletionStatus(overlapped);
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

 [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
 [SupportedOSPlatform("windows")]
 public static bool BindHandle(IntPtr osHandle)
 {
 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle);
 }

 [SupportedOSPlatform("windows")]
 public static bool BindHandle(SafeHandle osHandle!!)
 {
 bool mustReleaseSafeHandle = false;
 try
 {
 osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
 }
 finally
 {
 if (mustReleaseSafeHandle)
 osHandle.DangerousRelease();
 }
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
 }
}
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
Add support for Windows IO completions to the portable thread pool#64834

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

 Merged

kouvel
merged 13 commits into

from

Mar 4, 2022
 Merged


Add support for Windows IO completions to the portable thread pool
#64834
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
057ceed

Add support for Windows IO completions to the portable thread pool

Jan 8, 2022
37a66e0

Translate NtStatus codes to system error codes, fix some other failur…

Feb 7, 2022
3233ae0

Fix wasm build

Feb 7, 2022
7c0d7d5

Try to fix a time-sensitive test, enable some tests on Mono based on …

Feb 7, 2022
759e11a

Enable some more tests on Mono based on #34582

Feb 7, 2022
12f40a2

Miscellaneous fixes

Feb 8, 2022
0a2dc42

Temporarily enable libraries tests against Mono for this PR

Feb 8, 2022
64cca54

Try to fix a time-sensitive test that is occasionally failing

Feb 11, 2022
251de07

Note SOS usage of a variable

Feb 12, 2022
165842a

Address feedback

Feb 17, 2022
81f18f0

Revert "Temporarily enable libraries tests against Mono for this PR"

Feb 27, 2022
14893de

Fix build after rebase

Feb 27, 2022
a310f12

Add checks for some DOTNET vars from Net.Sockets and implement inlini…

Feb 27, 2022

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


6 changes: 1 addition & 5 deletions
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
 <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
 <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
 <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
 </Compile>
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down

28 changes: 2 additions & 26 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
 #region class _IOCompletionCallback

 internal unsafe class _IOCompletionCallback
 internal unsafe partial class _IOCompletionCallback
 {
 private readonly IOCompletionCallback _ioCompletionCallback;
 private readonly ExecutionContext _executionContext;
 private uint _errorCode; // Error code
 private uint _numBytes; // No. of bytes transferred
 private NativeOverlapped* _pNativeOverlapped;

 internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
 {
 _ioCompletionCallback = ioCompletionCallback;
 _executionContext = executionContext;
 }
 // Context callback: same sig for SendOrPostCallback and ContextCallback
 internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
 internal static void IOCompletionCallback_Context(object? state)
 {
 _IOCompletionCallback? helper = (_IOCompletionCallback?)state;
 Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
 helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
 }

 // call back helper
 internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
 {
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
 helper._errorCode = errorCode;
 helper._numBytes = numBytes;
 helper._pNativeOverlapped = pNativeOverlapped;
 ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
 ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
 }

 // Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
 return AllocateNativeOverlapped();
 }

 internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

 [MethodImpl(MethodImplOptions.InternalCall)]
 private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
 OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
 OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
 }

 internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
 }

 #endregion class Overlapped
Expand Down

75 changes: 75 additions & 0 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
 public static partial class ThreadPool
 {
 [CLSCompliant(false)]
 [SupportedOSPlatform("windows")]
 public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
 {
 if (overlapped == null)
 {
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
 }
Comment thread
kouvel marked this conversation as resolved.


Outdated


 if (UsePortableThreadPoolForIO)
 {
 // OS doesn't signal handle, so do it here
 overlapped->InternalLow = IntPtr.Zero;

 PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
 return true;
 }

 return PostQueuedCompletionStatus(overlapped);
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

 [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
 [SupportedOSPlatform("windows")]
 public static bool BindHandle(IntPtr osHandle)
 {
 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle);
 }

 [SupportedOSPlatform("windows")]
 public static bool BindHandle(SafeHandle osHandle!!)
 {
 bool mustReleaseSafeHandle = false;
 try
 {
 osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
 }
 finally
 {
 if (mustReleaseSafeHandle)
 osHandle.DangerousRelease();
 }
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
 }
}
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
Add support for Windows IO completions to the portable thread pool#64834

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

 Merged

kouvel
merged 13 commits into

from

Mar 4, 2022
 Merged


Add support for Windows IO completions to the portable thread pool
#64834
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
057ceed

Add support for Windows IO completions to the portable thread pool

Jan 8, 2022
37a66e0

Translate NtStatus codes to system error codes, fix some other failur…

Feb 7, 2022
3233ae0

Fix wasm build

Feb 7, 2022
7c0d7d5

Try to fix a time-sensitive test, enable some tests on Mono based on …

Feb 7, 2022
759e11a

Enable some more tests on Mono based on #34582

Feb 7, 2022
12f40a2

Miscellaneous fixes

Feb 8, 2022
0a2dc42

Temporarily enable libraries tests against Mono for this PR

Feb 8, 2022
64cca54

Try to fix a time-sensitive test that is occasionally failing

Feb 11, 2022
251de07

Note SOS usage of a variable

Feb 12, 2022
165842a

Address feedback

Feb 17, 2022
81f18f0

Revert "Temporarily enable libraries tests against Mono for this PR"

Feb 27, 2022
14893de

Fix build after rebase

Feb 27, 2022
a310f12

Add checks for some DOTNET vars from Net.Sockets and implement inlini…

Feb 27, 2022

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


6 changes: 1 addition & 5 deletions
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
 <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
 <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
 <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
 </Compile>
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down

28 changes: 2 additions & 26 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
 #region class _IOCompletionCallback

 internal unsafe class _IOCompletionCallback
 internal unsafe partial class _IOCompletionCallback
 {
 private readonly IOCompletionCallback _ioCompletionCallback;
 private readonly ExecutionContext _executionContext;
 private uint _errorCode; // Error code
 private uint _numBytes; // No. of bytes transferred
 private NativeOverlapped* _pNativeOverlapped;

 internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
 {
 _ioCompletionCallback = ioCompletionCallback;
 _executionContext = executionContext;
 }
 // Context callback: same sig for SendOrPostCallback and ContextCallback
 internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
 internal static void IOCompletionCallback_Context(object? state)
 {
 _IOCompletionCallback? helper = (_IOCompletionCallback?)state;
 Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
 helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
 }

 // call back helper
 internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
 {
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
 helper._errorCode = errorCode;
 helper._numBytes = numBytes;
 helper._pNativeOverlapped = pNativeOverlapped;
 ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
 ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
 }

 // Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
 return AllocateNativeOverlapped();
 }

 internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

 [MethodImpl(MethodImplOptions.InternalCall)]
 private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
 OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
 OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
 }

 internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
 }

 #endregion class Overlapped
Expand Down

75 changes: 75 additions & 0 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
 public static partial class ThreadPool
 {
 [CLSCompliant(false)]
 [SupportedOSPlatform("windows")]
 public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
 {
 if (overlapped == null)
 {
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
 }
Comment thread
kouvel marked this conversation as resolved.


Outdated


 if (UsePortableThreadPoolForIO)
 {
 // OS doesn't signal handle, so do it here
 overlapped->InternalLow = IntPtr.Zero;

 PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
 return true;
 }

 return PostQueuedCompletionStatus(overlapped);
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

 [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
 [SupportedOSPlatform("windows")]
 public static bool BindHandle(IntPtr osHandle)
 {
 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle);
 }

 [SupportedOSPlatform("windows")]
 public static bool BindHandle(SafeHandle osHandle!!)
 {
 bool mustReleaseSafeHandle = false;
 try
 {
 osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
 }
 finally
 {
 if (mustReleaseSafeHandle)
 osHandle.DangerousRelease();
 }
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
 }
}
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
Add support for Windows IO completions to the portable thread pool#64834

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

 Merged

kouvel
merged 13 commits into

from

Mar 4, 2022
 Merged


Add support for Windows IO completions to the portable thread pool
#64834
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
057ceed

Add support for Windows IO completions to the portable thread pool

Jan 8, 2022
37a66e0

Translate NtStatus codes to system error codes, fix some other failur…

Feb 7, 2022
3233ae0

Fix wasm build

Feb 7, 2022
7c0d7d5

Try to fix a time-sensitive test, enable some tests on Mono based on …

Feb 7, 2022
759e11a

Enable some more tests on Mono based on #34582

Feb 7, 2022
12f40a2

Miscellaneous fixes

Feb 8, 2022
0a2dc42

Temporarily enable libraries tests against Mono for this PR

Feb 8, 2022
64cca54

Try to fix a time-sensitive test that is occasionally failing

Feb 11, 2022
251de07

Note SOS usage of a variable

Feb 12, 2022
165842a

Address feedback

Feb 17, 2022
81f18f0

Revert "Temporarily enable libraries tests against Mono for this PR"

Feb 27, 2022
14893de

Fix build after rebase

Feb 27, 2022
a310f12

Add checks for some DOTNET vars from Net.Sockets and implement inlini…

Feb 27, 2022

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


6 changes: 1 addition & 5 deletions
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
 <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
 <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
 <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
 </Compile>
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down

28 changes: 2 additions & 26 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
 #region class _IOCompletionCallback

 internal unsafe class _IOCompletionCallback
 internal unsafe partial class _IOCompletionCallback
 {
 private readonly IOCompletionCallback _ioCompletionCallback;
 private readonly ExecutionContext _executionContext;
 private uint _errorCode; // Error code
 private uint _numBytes; // No. of bytes transferred
 private NativeOverlapped* _pNativeOverlapped;

 internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
 {
 _ioCompletionCallback = ioCompletionCallback;
 _executionContext = executionContext;
 }
 // Context callback: same sig for SendOrPostCallback and ContextCallback
 internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
 internal static void IOCompletionCallback_Context(object? state)
 {
 _IOCompletionCallback? helper = (_IOCompletionCallback?)state;
 Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
 helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
 }

 // call back helper
 internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
 {
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
 helper._errorCode = errorCode;
 helper._numBytes = numBytes;
 helper._pNativeOverlapped = pNativeOverlapped;
 ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
 ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
 }

 // Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
 return AllocateNativeOverlapped();
 }

 internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

 [MethodImpl(MethodImplOptions.InternalCall)]
 private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
 OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
 OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
 }

 internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
 }

 #endregion class Overlapped
Expand Down

75 changes: 75 additions & 0 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
 public static partial class ThreadPool
 {
 [CLSCompliant(false)]
 [SupportedOSPlatform("windows")]
 public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
 {
 if (overlapped == null)
 {
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
 }
Comment thread
kouvel marked this conversation as resolved.


Outdated


 if (UsePortableThreadPoolForIO)
 {
 // OS doesn't signal handle, so do it here
 overlapped->InternalLow = IntPtr.Zero;

 PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
 return true;
 }

 return PostQueuedCompletionStatus(overlapped);
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

 [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
 [SupportedOSPlatform("windows")]
 public static bool BindHandle(IntPtr osHandle)
 {
 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle);
 }

 [SupportedOSPlatform("windows")]
 public static bool BindHandle(SafeHandle osHandle!!)
 {
 bool mustReleaseSafeHandle = false;
 try
 {
 osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
 }
 finally
 {
 if (mustReleaseSafeHandle)
 osHandle.DangerousRelease();
 }
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
 }
}
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
Add support for Windows IO completions to the portable thread pool#64834

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

 Merged

kouvel
merged 13 commits into

from

Mar 4, 2022
 Merged


Add support for Windows IO completions to the portable thread pool
#64834
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
057ceed

Add support for Windows IO completions to the portable thread pool

Jan 8, 2022
37a66e0

Translate NtStatus codes to system error codes, fix some other failur…

Feb 7, 2022
3233ae0

Fix wasm build

Feb 7, 2022
7c0d7d5

Try to fix a time-sensitive test, enable some tests on Mono based on …

Feb 7, 2022
759e11a

Enable some more tests on Mono based on #34582

Feb 7, 2022
12f40a2

Miscellaneous fixes

Feb 8, 2022
0a2dc42

Temporarily enable libraries tests against Mono for this PR

Feb 8, 2022
64cca54

Try to fix a time-sensitive test that is occasionally failing

Feb 11, 2022
251de07

Note SOS usage of a variable

Feb 12, 2022
165842a

Address feedback

Feb 17, 2022
81f18f0

Revert "Temporarily enable libraries tests against Mono for this PR"

Feb 27, 2022
14893de

Fix build after rebase

Feb 27, 2022
a310f12

Add checks for some DOTNET vars from Net.Sockets and implement inlini…

Feb 27, 2022

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


6 changes: 1 addition & 5 deletions
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
 <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
 <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
 <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
 </Compile>
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down

28 changes: 2 additions & 26 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
 #region class _IOCompletionCallback

 internal unsafe class _IOCompletionCallback
 internal unsafe partial class _IOCompletionCallback
 {
 private readonly IOCompletionCallback _ioCompletionCallback;
 private readonly ExecutionContext _executionContext;
 private uint _errorCode; // Error code
 private uint _numBytes; // No. of bytes transferred
 private NativeOverlapped* _pNativeOverlapped;

 internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
 {
 _ioCompletionCallback = ioCompletionCallback;
 _executionContext = executionContext;
 }
 // Context callback: same sig for SendOrPostCallback and ContextCallback
 internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
 internal static void IOCompletionCallback_Context(object? state)
 {
 _IOCompletionCallback? helper = (_IOCompletionCallback?)state;
 Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
 helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
 }

 // call back helper
 internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
 {
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
 helper._errorCode = errorCode;
 helper._numBytes = numBytes;
 helper._pNativeOverlapped = pNativeOverlapped;
 ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
 ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
 }

 // Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
 return AllocateNativeOverlapped();
 }

 internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

 [MethodImpl(MethodImplOptions.InternalCall)]
 private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
 OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
 OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
 }

 internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
 }

 #endregion class Overlapped
Expand Down

75 changes: 75 additions & 0 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
 public static partial class ThreadPool
 {
 [CLSCompliant(false)]
 [SupportedOSPlatform("windows")]
 public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
 {
 if (overlapped == null)
 {
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
 }
Comment thread
kouvel marked this conversation as resolved.


Outdated


 if (UsePortableThreadPoolForIO)
 {
 // OS doesn't signal handle, so do it here
 overlapped->InternalLow = IntPtr.Zero;

 PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
 return true;
 }

 return PostQueuedCompletionStatus(overlapped);
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

 [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
 [SupportedOSPlatform("windows")]
 public static bool BindHandle(IntPtr osHandle)
 {
 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle);
 }

 [SupportedOSPlatform("windows")]
 public static bool BindHandle(SafeHandle osHandle!!)
 {
 bool mustReleaseSafeHandle = false;
 try
 {
 osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
 }
 finally
 {
 if (mustReleaseSafeHandle)
 osHandle.DangerousRelease();
 }
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
 }
}
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
Add support for Windows IO completions to the portable thread pool#64834

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

 Merged

kouvel
merged 13 commits into

from

Mar 4, 2022
 Merged


Add support for Windows IO completions to the portable thread pool
#64834
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
057ceed

Add support for Windows IO completions to the portable thread pool

Jan 8, 2022
37a66e0

Translate NtStatus codes to system error codes, fix some other failur…

Feb 7, 2022
3233ae0

Fix wasm build

Feb 7, 2022
7c0d7d5

Try to fix a time-sensitive test, enable some tests on Mono based on …

Feb 7, 2022
759e11a

Enable some more tests on Mono based on #34582

Feb 7, 2022
12f40a2

Miscellaneous fixes

Feb 8, 2022
0a2dc42

Temporarily enable libraries tests against Mono for this PR

Feb 8, 2022
64cca54

Try to fix a time-sensitive test that is occasionally failing

Feb 11, 2022
251de07

Note SOS usage of a variable

Feb 12, 2022
165842a

Address feedback

Feb 17, 2022
81f18f0

Revert "Temporarily enable libraries tests against Mono for this PR"

Feb 27, 2022
14893de

Fix build after rebase

Feb 27, 2022
a310f12

Add checks for some DOTNET vars from Net.Sockets and implement inlini…

Feb 27, 2022

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


6 changes: 1 addition & 5 deletions
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,9 +232,6 @@
 <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Overlapped.cs" />
Expand DownExpand Up@@ -289,14 +286,13 @@
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\LowLevelLifoSemaphore.Unix.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
 <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
 <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
 </Compile>
 <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.Windows.cs" />
 </ItemGroup>
 <ItemGroup Condition="'$(FeatureObjCMarshal)' == 'true'">
 <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ObjectiveCMarshal.CoreCLR.cs" />
Expand Down

28 changes: 2 additions & 26 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Overlapped.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,28 +27,8 @@ namespace System.Threading
{
 #region class _IOCompletionCallback

 internal unsafe class _IOCompletionCallback
 internal unsafe partial class _IOCompletionCallback
 {
 private readonly IOCompletionCallback _ioCompletionCallback;
 private readonly ExecutionContext _executionContext;
 private uint _errorCode; // Error code
 private uint _numBytes; // No. of bytes transferred
 private NativeOverlapped* _pNativeOverlapped;

 internal _IOCompletionCallback(IOCompletionCallback ioCompletionCallback, ExecutionContext executionContext)
 {
 _ioCompletionCallback = ioCompletionCallback;
 _executionContext = executionContext;
 }
 // Context callback: same sig for SendOrPostCallback and ContextCallback
 internal static ContextCallback _ccb = new ContextCallback(IOCompletionCallback_Context);
 internal static void IOCompletionCallback_Context(object? state)
 {
 _IOCompletionCallback? helper = (_IOCompletionCallback?)state;
 Debug.Assert(helper != null, "_IOCompletionCallback cannot be null");
 helper._ioCompletionCallback(helper._errorCode, helper._numBytes, helper._pNativeOverlapped);
 }

 // call back helper
 internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped* pNativeOverlapped)
 {
Expand All@@ -69,7 +49,7 @@ internal static void PerformIOCompletionCallback(uint errorCode, uint numBytes,
 helper._errorCode = errorCode;
 helper._numBytes = numBytes;
 helper._pNativeOverlapped = pNativeOverlapped;
 ExecutionContext.RunInternal(helper._executionContext, _ccb, helper);
 ExecutionContext.RunInternal(helper._executionContext, IOCompletionCallback_Context_Delegate, helper);
 }

 // Quickly check the VM again, to see if a packet has arrived.
Expand DownExpand Up@@ -132,8 +112,6 @@ internal sealed unsafe class OverlappedData
 return AllocateNativeOverlapped();
 }

 internal bool IsUserObject(byte[]? buffer) => ReferenceEquals(_userObject, buffer);

 [MethodImpl(MethodImplOptions.InternalCall)]
 private extern NativeOverlapped* AllocateNativeOverlapped();

Expand DownExpand Up@@ -254,8 +232,6 @@ public static unsafe void Free(NativeOverlapped* nativeOverlappedPtr!!)
 OverlappedData.GetOverlappedFromNative(nativeOverlappedPtr)._overlapped._overlappedData = null;
 OverlappedData.FreeNativeOverlapped(nativeOverlappedPtr);
 }

 internal bool IsUserObject(byte[]? buffer) => _overlappedData!.IsUserObject(buffer);
 }

 #endregion class Overlapped
Expand Down

75 changes: 75 additions & 0 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/ThreadPool.CoreCLR.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace System.Threading
{
 public static partial class ThreadPool
 {
 [CLSCompliant(false)]
 [SupportedOSPlatform("windows")]
 public static unsafe bool UnsafeQueueNativeOverlapped(NativeOverlapped* overlapped)
 {
 if (overlapped == null)
 {
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.overlapped);
 }
Comment thread
kouvel marked this conversation as resolved.


Outdated


 if (UsePortableThreadPoolForIO)
 {
 // OS doesn't signal handle, so do it here
 overlapped->InternalLow = IntPtr.Zero;

 PortableThreadPool.ThreadPoolInstance.QueueNativeOverlapped(overlapped);
 return true;
 }

 return PostQueuedCompletionStatus(overlapped);
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern unsafe bool PostQueuedCompletionStatus(NativeOverlapped* overlapped);

 [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Use ThreadPool.BindHandle(SafeHandle) instead.")]
 [SupportedOSPlatform("windows")]
 public static bool BindHandle(IntPtr osHandle)
 {
 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle);
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle);
 }

 [SupportedOSPlatform("windows")]
 public static bool BindHandle(SafeHandle osHandle!!)
 {
 bool mustReleaseSafeHandle = false;
 try
 {
 osHandle.DangerousAddRef(ref mustReleaseSafeHandle);

 if (UsePortableThreadPoolForIO)
 {
 PortableThreadPool.ThreadPoolInstance.RegisterForIOCompletionNotifications(osHandle.DangerousGetHandle());
 return true;
 }

 return BindIOCompletionCallbackNative(osHandle.DangerousGetHandle());
 }
 finally
 {
 if (mustReleaseSafeHandle)
 osHandle.DangerousRelease();
 }
 }

 [MethodImpl(MethodImplOptions.InternalCall)]
 private static extern bool BindIOCompletionCallbackNative(IntPtr fileHandle);
 }
}
Loading