Skip to content

[release/8.0-staging] Handle NativeOverlapped* coming from both the Windows or Portable thread pool in NativeRuntimeEventSource #99656

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
eduardo-vp merged 9 commits into from
Mar 16, 2024
Merged

[release/8.0-staging] Handle NativeOverlapped* coming from both the Windows or Portable thread pool in NativeRuntimeEventSource #99656

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6cf193a
Handle NativeOverlapped* coming from both Portable and Windows thread…
eduardo-vp Jan 23, 2024
58521ff
Revert "Handle NativeOverlapped* coming from both Portable and Window…
eduardo-vp Jan 24, 2024
3207d07
Fix IOEnqueue / IODequeue / IOPack
eduardo-vp Jan 24, 2024
466edcc
Move code inside the if(IsEnabled) block
eduardo-vp Jan 24, 2024
57e8d6d
Fix typo
eduardo-vp Jan 24, 2024
27f8860
Add ReadAsyncTest
eduardo-vp Feb 7, 2024
b019cfd
Add test. Verified that fails before the changes and passes after
eduardo-vp Feb 8, 2024
0f49036
Remove Console.WriteLine
eduardo-vp Feb 8, 2024
6fdb7d9
Removing test. Will add in another PR
eduardo-vp Feb 9, 2024
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
Prev Previous commit
Next Next commit
Move code inside the if(IsEnabled) block
  • Loading branch information
@eduardo-vp
eduardo-vp authored and github-actions committed Mar 13, 2024
commit 466edccedc751137102cafc10c7b01eea4693f7a
12 changes: 6 additions & 6 deletions ....CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.NativeSinks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,13 @@ private unsafe void ThreadPoolIOEnqueue(
[MethodImpl(MethodImplOptions.NoInlining)]
public unsafe void ThreadPoolIOEnqueue(NativeOverlapped* nativeOverlapped)
{
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword | Keywords.ThreadTransferKeyword))
{
#if TARGET_WINDOWS
IntPtr overlapped = ThreadPool.UseWindowsThreadPool ? 0 : (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#else
IntPtr overlapped = (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#endif
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword | Keywords.ThreadTransferKeyword))
{
ThreadPoolIOEnqueue(
(IntPtr)nativeOverlapped,
overlapped,
Expand Down Expand Up @@ -246,13 +246,13 @@ private unsafe void ThreadPoolIODequeue(
[MethodImpl(MethodImplOptions.NoInlining)]
public unsafe void ThreadPoolIODequeue(NativeOverlapped* nativeOverlapped)
{
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword | Keywords.ThreadTransferKeyword))
{
#if TARGET_WINDOWS
IntPtr overlapped = ThreadPool.UseWindowsThreadPool ? 0 : (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#else
IntPtr overlapped = (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#endif
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword | Keywords.ThreadTransferKeyword))
{
ThreadPoolIODequeue(
(IntPtr)nativeOverlapped,
overlapped);
Expand Down Expand Up @@ -285,13 +285,13 @@ public unsafe void ThreadPoolWorkingThreadCount(uint Count, ushort ClrInstanceID
[MethodImpl(MethodImplOptions.NoInlining)]
public unsafe void ThreadPoolIOPack(NativeOverlapped* nativeOverlapped)
{
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword))
{
#if TARGET_WINDOWS
IntPtr overlapped = ThreadPool.UseWindowsThreadPool ? 0 : (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#else
IntPtr overlapped = (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#endif
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword))
{
ThreadPoolIOPack(
(IntPtr)nativeOverlapped,
overlapped);
Expand Down
4 changes: 2 additions & 2 deletions ...stem.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,13 +440,13 @@ public unsafe void ThreadPoolWorkingThreadCount(uint Count, ushort ClrInstanceID
[MethodImpl(MethodImplOptions.NoInlining)]
public unsafe void ThreadPoolIOPack(NativeOverlapped* nativeOverlapped)
{
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword))
{
#if TARGET_WINDOWS
IntPtr overlapped = ThreadPool.UseWindowsThreadPool ? 0 : (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#else
IntPtr overlapped = (IntPtr)Overlapped.GetOverlappedFromNative(nativeOverlapped).GetHashCode();
#endif
if (IsEnabled(EventLevel.Verbose, Keywords.ThreadingKeyword))
{
ThreadPoolIOPack(
(IntPtr)nativeOverlapped,
overlapped);
Expand Down