From 41d9c1cc0dca16743a54971930e81d60777af746 Mon Sep 17 00:00:00 2001
From: Eduardo Velarde <32459232+eduardo-vp@users.noreply.github.com>
Date: Fri, 17 Jun 2022 10:56:23 -0700
Subject: [PATCH] Add event to capture min/max threads (#70063)
Event ThreadPoolMinMaxThreads added.
Parameters are:
ushort MinWorkerThreads
ushort MaxWorkerThreads
ushort MinIOCompletionThreads
ushort MaxIOCompletionThreads
ushort ClrInstanceID
It is fired in the ThreadPool constructor and in the SetMinThreads/SetMaxThreads functions.
---
...ource.PortableThreadPool.NativeSinks.CoreCLR.cs | 4 +
src/coreclr/gc/env/etmdummy.h | 1 +
src/coreclr/vm/ClrEtwAll.man | 35 +++++++-
src/coreclr/vm/nativeeventsource.cpp | 10 +++
src/coreclr/vm/nativeeventsource.h | 1 +
src/coreclr/vm/qcallentrypoints.cpp | 1 +
...meEventSource.PortableThreadPool.NativeSinks.cs | 17 ++++
.../NativeRuntimeEventSource.PortableThreadPool.cs | 39 +++++++++
.../src/System/Threading/PortableThreadPool.cs | 28 +++++++
.../tests/ThreadPoolTests.cs | 92 ++++++++++++++++++++++
...ntSource.PortableThreadPool.NativeSinks.Mono.cs | 4 +
src/mono/mono/component/event_pipe-stub.c | 20 +++++
src/mono/mono/component/event_pipe.c | 1 +
src/mono/mono/component/event_pipe.h | 9 +++
src/mono/mono/eventpipe/ep-rt-mono.c | 18 +++++
src/mono/mono/eventpipe/ep-rt-mono.h | 8 ++
src/mono/mono/eventpipe/gen-eventing-event-inc.lst | 1 +
src/mono/mono/metadata/icall-decl.h | 1 +
src/mono/mono/metadata/icall-def.h | 1 +
src/mono/mono/metadata/icall-eventpipe.c | 29 +++++++
20 files changed, 319 insertions(+), 1 deletion(-)
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs
index f833134..cbf6e46 100644
--- a/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs
+++ b/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs
@@ -26,6 +26,10 @@ namespace System.Diagnostics.Tracing
[NonEvent]
[LibraryImport(RuntimeHelpers.QCall)]
+ internal static partial void LogThreadPoolMinMaxThreads(ushort MinWorkerThreads, ushort MaxWorkerThreads, ushort MinIOCompletionThreads, ushort MaxIOCompletionThreads, ushort ClrInstanceID);
+
+ [NonEvent]
+ [LibraryImport(RuntimeHelpers.QCall)]
internal static partial void LogThreadPoolWorkerThreadAdjustmentSample(double Throughput, ushort ClrInstanceID);
[NonEvent]
diff --git a/src/coreclr/gc/env/etmdummy.h b/src/coreclr/gc/env/etmdummy.h
index 5563721..575e306 100644
--- a/src/coreclr/gc/env/etmdummy.h
+++ b/src/coreclr/gc/env/etmdummy.h
@@ -78,6 +78,7 @@
#define FireEtwThreadPoolWorkerThreadAdjustmentAdjustment(AverageThroughput, NewWorkerThreadCount, Reason, ClrInstanceID) 0
#define FireEtwThreadPoolWorkerThreadAdjustmentStats(Duration, Throughput, ThreadWave, ThroughputWave, ThroughputErrorEstimate, AverageThroughputErrorEstimate, ThroughputRatio, Confidence, NewControlSetting, NewThreadWaveMagnitude, ClrInstanceID) 0
#define FireEtwThreadPoolWorkerThreadWait(ActiveWorkerThreadCount, RetiredWorkerThreadCount, ClrInstanceID) 0
+#define FireEtwThreadPoolMinMaxThreads (MinWorkerThreads, MaxWorkerThreads, MinIOCompletionThreads, MaxIOCompletionThreads, ClrInstanceID) 0
#define FireEtwThreadPoolWorkingThreadCount(Count, ClrInstanceID) 0
#define FireEtwThreadPoolEnqueue(WorkID, ClrInstanceID) 0
#define FireEtwThreadPoolDequeue(WorkID, ClrInstanceID) 0
diff --git a/src/coreclr/vm/ClrEtwAll.man b/src/coreclr/vm/ClrEtwAll.man
index a55dec6..761d650 100644
--- a/src/coreclr/vm/ClrEtwAll.man
+++ b/src/coreclr/vm/ClrEtwAll.man
@@ -446,7 +446,13 @@
-
+
+
+
+
+
@@ -1579,6 +1585,24 @@
+
+
+
+
+
+
+
+
+
+ %1
+ %2
+ %3
+ %4
+ %5
+
+
+
+
@@ -3455,6 +3479,13 @@
keywords="ThreadingKeyword" task="YieldProcessorMeasurement" opcode="win:Info"
symbol="YieldProcessorMeasurement" message="$(string.RuntimePublisher.YieldProcessorMeasurementEventMessage)"/>
+
+
+
@@ -8529,6 +8561,7 @@
+
diff --git a/src/coreclr/vm/nativeeventsource.cpp b/src/coreclr/vm/nativeeventsource.cpp
index f2a8d7f..9ec8310 100644
--- a/src/coreclr/vm/nativeeventsource.cpp
+++ b/src/coreclr/vm/nativeeventsource.cpp
@@ -74,6 +74,16 @@ extern "C" void QCALLTYPE LogThreadPoolWorkerThreadWait(_In_z_ uint activeWorker
END_QCALL;
}
+extern "C" void QCALLTYPE LogThreadPoolMinMaxThreads(_In_z_ short minWorkerThreads, _In_z_ short maxWorkerThreads, _In_z_ short minIOCompletionThreads, _In_z_ short maxIOCompletionThreads, _In_z_ short clrInstanceID)
+{
+ QCALL_CONTRACT;
+ BEGIN_QCALL;
+
+ FireEtwThreadPoolMinMaxThreads(minWorkerThreads, maxWorkerThreads, minIOCompletionThreads, maxIOCompletionThreads, clrInstanceID);
+
+ END_QCALL;
+}
+
extern "C" void QCALLTYPE LogThreadPoolWorkerThreadAdjustmentSample(_In_z_ double throughput, _In_z_ short clrInstanceID)
{
QCALL_CONTRACT;
diff --git a/src/coreclr/vm/nativeeventsource.h b/src/coreclr/vm/nativeeventsource.h
index 6f89d55..c649f7d9 100644
--- a/src/coreclr/vm/nativeeventsource.h
+++ b/src/coreclr/vm/nativeeventsource.h
@@ -20,6 +20,7 @@ extern "C" BOOL QCALLTYPE IsEventSourceLoggingEnabled();
extern "C" void QCALLTYPE LogThreadPoolWorkerThreadStart(_In_z_ uint activeWorkerThreadCount, _In_z_ uint retiredWorkerThreadCount, _In_z_ short clrInstanceID);
extern "C" void QCALLTYPE LogThreadPoolWorkerThreadStop(_In_z_ uint activeWorkerThreadCount, _In_z_ uint retiredWorkerThreadCount, _In_z_ short clrInstanceID);
extern "C" void QCALLTYPE LogThreadPoolWorkerThreadWait(_In_z_ uint activeWorkerThreadCount, _In_z_ uint retiredWorkerThreadCount, _In_z_ short clrInstanceID);
+extern "C" void QCALLTYPE LogThreadPoolMinMaxThreads(_In_z_ short minWorkerThreads, _In_z_ short maxWorkerThreads, _In_z_ short minIOCompletionThreads, _In_z_ short maxIOCompletionThreads, _In_z_ short clrInstanceID);
extern "C" void QCALLTYPE LogThreadPoolWorkerThreadAdjustmentSample(_In_z_ double throughput, _In_z_ short clrInstanceID);
extern "C" void QCALLTYPE LogThreadPoolWorkerThreadAdjustmentAdjustment(_In_z_ double averageThroughput, _In_z_ uint newWorkerThreadCount, _In_z_ uint reason, _In_z_ short clrInstanceID);
extern "C" void QCALLTYPE LogThreadPoolWorkerThreadAdjustmentStats(_In_z_ double duration, _In_z_ double throughput, _In_z_ double threadWave, _In_z_ double throughputWave, _In_z_ double throughputErrorEstimate, _In_z_ double AverageThroughputErrorEstimate, _In_z_ double ThroughputRatio, _In_z_ double confidence, _In_z_ double newControlSetting, _In_z_ short newThreadWaveMagnitude, _In_z_ short ClrInstanceID);
diff --git a/src/coreclr/vm/qcallentrypoints.cpp b/src/coreclr/vm/qcallentrypoints.cpp
index 9f4851e..15c5fc5 100644
--- a/src/coreclr/vm/qcallentrypoints.cpp
+++ b/src/coreclr/vm/qcallentrypoints.cpp
@@ -275,6 +275,7 @@ static const Entry s_QCall[] =
DllImportEntry(LogThreadPoolWorkerThreadStart)
DllImportEntry(LogThreadPoolWorkerThreadStop)
DllImportEntry(LogThreadPoolWorkerThreadWait)
+ DllImportEntry(LogThreadPoolMinMaxThreads)
DllImportEntry(LogThreadPoolWorkerThreadAdjustmentSample)
DllImportEntry(LogThreadPoolWorkerThreadAdjustmentAdjustment)
DllImportEntry(LogThreadPoolWorkerThreadAdjustmentStats)
diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs
index 477d113..5e02261 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs
@@ -26,6 +26,7 @@ namespace System.Diagnostics.Tracing
private static class Messages
{
public const string WorkerThread = "ActiveWorkerThreadCount={0};\nRetiredWorkerThreadCount={1};\nClrInstanceID={2}";
+ public const string MinMaxThreads = "MinWorkerThreads={0};\nMaxWorkerThreads={1};\nMinIOCompletionThreads={2};\nMaxIOCompletionThreads={3};\nClrInstanceID={4}";
public const string WorkerThreadAdjustmentSample = "Throughput={0};\nClrInstanceID={1}";
public const string WorkerThreadAdjustmentAdjustment = "AverageThroughput={0};\nNewWorkerThreadCount={1};\nReason={2};\nClrInstanceID={3}";
public const string WorkerThreadAdjustmentStats = "Duration={0};\nThroughput={1};\nThreadWave={2};\nThroughputWave={3};\nThroughputErrorEstimate={4};\nAverageThroughputErrorEstimate={5};\nThroughputRatio={6};\nConfidence={7};\nNewControlSetting={8};\nNewThreadWaveMagnitude={9};\nClrInstanceID={10}";
@@ -41,6 +42,7 @@ namespace System.Diagnostics.Tracing
public const EventTask ThreadPoolWorkerThreadAdjustment = (EventTask)18;
public const EventTask ThreadPool = (EventTask)23;
public const EventTask ThreadPoolWorkingThreadCount = (EventTask)22;
+ public const EventTask ThreadPoolMinMaxThreads = (EventTask)38;
}
public static class Opcodes // this name and visibility is important for EventSource
@@ -248,5 +250,20 @@ namespace System.Diagnostics.Tracing
{
LogThreadPoolIOPack(NativeOverlapped, Overlapped, ClrInstanceID);
}
+
+
+ [Event(59, Level = EventLevel.Informational, Message = Messages.MinMaxThreads, Task = Tasks.ThreadPoolMinMaxThreads, Opcode = EventOpcode.Info, Version = 0, Keywords = Keywords.ThreadingKeyword)]
+ public unsafe void ThreadPoolMinMaxThreads(
+ ushort MinWorkerThreads,
+ ushort MaxWorkerThreads,
+ ushort MinIOCompletionThreads,
+ ushort MaxIOCompletionThreads,
+ ushort ClrInstanceID = DefaultClrInstanceId)
+ {
+ if (IsEnabled(EventLevel.Informational, Keywords.ThreadingKeyword))
+ {
+ LogThreadPoolMinMaxThreads(MinWorkerThreads, MaxWorkerThreads, MinIOCompletionThreads, MaxIOCompletionThreads, ClrInstanceID);
+ }
+ }
}
}
diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs
index 6e4b13e..0031309 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs
@@ -29,6 +29,7 @@ namespace System.Diagnostics.Tracing
private static class Messages
{
public const string WorkerThread = "ActiveWorkerThreadCount={0};\nRetiredWorkerThreadCount={1};\nClrInstanceID={2}";
+ public const string MinMaxThreads = "MinWorkerThreads={0};\nMaxWorkerThreads={1};\nMinIOCompletionThreads={2};\nMaxIOCompletionThreads={3};\nClrInstanceID={4}";
public const string WorkerThreadAdjustmentSample = "Throughput={0};\nClrInstanceID={1}";
public const string WorkerThreadAdjustmentAdjustment = "AverageThroughput={0};\nNewWorkerThreadCount={1};\nReason={2};\nClrInstanceID={3}";
public const string WorkerThreadAdjustmentStats = "Duration={0};\nThroughput={1};\nThreadWave={2};\nThroughputWave={3};\nThroughputErrorEstimate={4};\nAverageThroughputErrorEstimate={5};\nThroughputRatio={6};\nConfidence={7};\nNewControlSetting={8};\nNewThreadWaveMagnitude={9};\nClrInstanceID={10}";
@@ -44,6 +45,7 @@ namespace System.Diagnostics.Tracing
public const EventTask ThreadPoolWorkerThreadAdjustment = (EventTask)18;
public const EventTask ThreadPool = (EventTask)23;
public const EventTask ThreadPoolWorkingThreadCount = (EventTask)22;
+ public const EventTask ThreadPoolMinMaxThreads = (EventTask)38;
}
public static class Opcodes // this name and visibility is important for EventSource
@@ -398,5 +400,42 @@ namespace System.Diagnostics.Tracing
data[2].Reserved = 0;
WriteEventCore(65, 3, data);
}
+
+
+#if !ES_BUILD_STANDALONE
+ [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:UnrecognizedReflectionPattern",
+ Justification = EventSourceSuppressMessage)]
+#endif
+ [Event(59, Level = EventLevel.Informational, Message = Messages.MinMaxThreads, Task = Tasks.ThreadPoolMinMaxThreads, Opcode = EventOpcode.Info, Version = 0, Keywords = Keywords.ThreadingKeyword)]
+ public unsafe void ThreadPoolMinMaxThreads(
+ ushort MinWorkerThreads,
+ ushort MaxWorkerThreads,
+ ushort MinIOCompletionThreads,
+ ushort MaxIOCompletionThreads,
+ ushort ClrInstanceID = DefaultClrInstanceId)
+ {
+ if (!IsEnabled(EventLevel.Informational, Keywords.ThreadingKeyword))
+ {
+ return;
+ }
+ EventData* data = stackalloc EventData[5];
+ data[0].DataPointer = (IntPtr)(&MinWorkerThreads);
+ data[0].Size = sizeof(ushort);
+ data[0].Reserved = 0;
+ data[1].DataPointer = (IntPtr)(&MaxWorkerThreads);
+ data[1].Size = sizeof(ushort);
+ data[1].Reserved = 0;
+ data[2].DataPointer = (IntPtr)(&MinIOCompletionThreads);
+ data[2].Size = sizeof(ushort);
+ data[2].Reserved = 0;
+ data[3].DataPointer = (IntPtr)(&MaxIOCompletionThreads);
+ data[3].Size = sizeof(ushort);
+ data[3].Reserved = 0;
+ data[4].DataPointer = (IntPtr)(&ClrInstanceID);
+ data[4].Size = sizeof(ushort);
+ data[4].Reserved = 0;
+ WriteEventCore(59, 5, data);
+ }
+
}
}
diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs
index 92fbb2a..847a9e71 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Diagnostics;
+using System.Diagnostics.Tracing;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -111,6 +112,15 @@ namespace System.Threading
_legacy_minIOCompletionThreads = 1;
_legacy_maxIOCompletionThreads = 1000;
+ if (NativeRuntimeEventSource.Log.IsEnabled())
+ {
+ NativeRuntimeEventSource.Log.ThreadPoolMinMaxThreads(
+ (ushort)_minThreads,
+ (ushort)_maxThreads,
+ (ushort)_legacy_minIOCompletionThreads,
+ (ushort)_legacy_maxIOCompletionThreads);
+ }
+
_separated.counts.NumThreadsGoal = _minThreads;
#if TARGET_WINDOWS
@@ -186,6 +196,15 @@ namespace System.Threading
addWorker = true;
}
}
+
+ if (NativeRuntimeEventSource.Log.IsEnabled())
+ {
+ NativeRuntimeEventSource.Log.ThreadPoolMinMaxThreads(
+ (ushort)_minThreads,
+ (ushort)_maxThreads,
+ (ushort)_legacy_minIOCompletionThreads,
+ (ushort)_legacy_maxIOCompletionThreads);
+ }
}
finally
{
@@ -256,6 +275,15 @@ namespace System.Threading
{
_separated.counts.InterlockedSetNumThreadsGoal(newMaxThreads);
}
+
+ if (NativeRuntimeEventSource.Log.IsEnabled())
+ {
+ NativeRuntimeEventSource.Log.ThreadPoolMinMaxThreads(
+ (ushort)_minThreads,
+ (ushort)_maxThreads,
+ (ushort)_legacy_minIOCompletionThreads,
+ (ushort)_legacy_maxIOCompletionThreads);
+ }
return true;
}
finally
diff --git a/src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs b/src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs
index 9c6b06e..f0017ea 100644
--- a/src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs
+++ b/src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Diagnostics;
+using System.Diagnostics.Tracing;
using System.IO;
using System.Linq;
using System.Reflection;
@@ -1063,6 +1064,97 @@ namespace System.Threading.ThreadPools.Tests
}).Dispose();
}
+ private class ClrMinMaxThreadsEventListener : EventListener
+ {
+ private const string ClrProviderName = "Microsoft-Windows-DotNETRuntime";
+ private const EventKeywords ThreadingKeyword = (EventKeywords)0x10000;
+ private const int ThreadPoolMinMaxThreadsEventId = 59;
+
+ private readonly int _expectedEventCount;
+
+ public List Payloads { get; } = new List();
+ public AutoResetEvent AllEventsReceived { get; } = new AutoResetEvent(false);
+ public ClrMinMaxThreadsEventListener(int expectedEventCount) => _expectedEventCount = expectedEventCount;
+
+ protected override void OnEventSourceCreated(EventSource eventSource)
+ {
+ if (eventSource.Name == ClrProviderName)
+ {
+ EnableEvents(eventSource, EventLevel.Informational, ThreadingKeyword);
+ }
+
+ base.OnEventSourceCreated(eventSource);
+ }
+
+ protected override void OnEventWritten(EventWrittenEventArgs eventData)
+ {
+ if (eventData.EventId == ThreadPoolMinMaxThreadsEventId)
+ {
+ var payloads = new object[eventData.Payload.Count];
+ eventData.Payload?.CopyTo(payloads, 0);
+ Payloads.Add(payloads);
+ if (Payloads.Count == _expectedEventCount)
+ {
+ AllEventsReceived.Set();
+ }
+
+ }
+
+ base.OnEventWritten(eventData);
+ }
+ }
+
+ [ConditionalFact(nameof(IsThreadingAndRemoteExecutorSupported))]
+ public void ThreadPoolMinMaxThreadsEventTest()
+ {
+ // The ThreadPoolMinMaxThreads event is fired when the ThreadPool is created
+ // or when SetMinThreads/SetMaxThreads are called
+ // Each time the event is fired, it is verified that it recorded the correct values
+ RemoteExecutor.Invoke(() =>
+ {
+ const int ExpectedEventCount = 3;
+
+ using var el = new ClrMinMaxThreadsEventListener(ExpectedEventCount);
+
+ int newMinWorkerThreads = 3;
+ int newMinIOCompletionThreads = 4;
+
+ int newMaxWorkerThreads = 10;
+ int newMaxIOCompletionThreads = 11;
+
+ ThreadPool.SetMinThreads(newMinWorkerThreads, newMinIOCompletionThreads);
+ ThreadPool.SetMaxThreads(newMaxWorkerThreads, newMaxIOCompletionThreads);
+
+ el.AllEventsReceived.CheckedWait();
+
+ Assert.Equal(ExpectedEventCount, el.Payloads.Count);
+
+ // Basic validation for all events
+ foreach (object[] payload in el.Payloads)
+ {
+ Assert.Equal(5, payload.Length);
+ for (int i = 0; i < 5; i++)
+ {
+ Assert.IsType(payload[i]);
+ if (i < 4)
+ {
+ Assert.NotEqual((ushort)0, (ushort)payload[i]);
+ }
+ }
+ }
+
+ // Based on change from SetMinThreads:
+ Assert.Equal(newMinWorkerThreads, (ushort)el.Payloads[1][0]);
+ Assert.Equal(newMinIOCompletionThreads, (ushort)el.Payloads[1][2]);
+
+ // Based on change from SetMaxThreads:
+ Assert.Equal(newMinWorkerThreads, (ushort)el.Payloads[2][0]);
+ Assert.Equal(newMinIOCompletionThreads, (ushort)el.Payloads[2][2]);
+ Assert.Equal(newMaxWorkerThreads, (ushort)el.Payloads[2][1]);
+ Assert.Equal(newMaxIOCompletionThreads, (ushort)el.Payloads[2][3]);
+ }).Dispose();
+ }
+
public static bool IsThreadingAndRemoteExecutorSupported =>
PlatformDetection.IsThreadingSupported && RemoteExecutor.IsSupported;
}
diff --git a/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs
index ed34ddf..6cf0ad3 100644
--- a/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs
+++ b/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs
@@ -26,6 +26,10 @@ namespace System.Diagnostics.Tracing
[NonEvent]
[MethodImplAttribute(MethodImplOptions.InternalCall)]
+ internal static extern void LogThreadPoolMinMaxThreads(ushort MinWorkerThreads, ushort MaxWorkerThreads, ushort MinIOCompletionThreads, ushort MaxIOCompletionThreads, ushort ClrInstanceID);
+
+ [NonEvent]
+ [MethodImplAttribute(MethodImplOptions.InternalCall)]
internal static extern void LogThreadPoolWorkerThreadAdjustmentSample(double Throughput, ushort ClrInstanceID);
[NonEvent]
diff --git a/src/mono/mono/component/event_pipe-stub.c b/src/mono/mono/component/event_pipe-stub.c
index 5069532..3e34c42 100644
--- a/src/mono/mono/component/event_pipe-stub.c
+++ b/src/mono/mono/component/event_pipe-stub.c
@@ -129,6 +129,14 @@ event_pipe_stub_write_event_threadpool_worker_thread_wait (
uint16_t clr_instance_id);
static bool
+event_pipe_stub_write_event_threadpool_min_max_threads (
+ uint16_t min_worker_threads,
+ uint16_t max_worker_threads,
+ uint16_t min_io_completion_threads,
+ uint16_t max_io_completion_threads,
+ uint16_t clr_instance_id);
+
+static bool
event_pipe_stub_write_event_threadpool_worker_thread_adjustment_sample (
double throughput,
uint16_t clr_instance_id);
@@ -213,6 +221,7 @@ static MonoComponentEventPipe fn_table = {
&event_pipe_stub_write_event_threadpool_worker_thread_start,
&event_pipe_stub_write_event_threadpool_worker_thread_stop,
&event_pipe_stub_write_event_threadpool_worker_thread_wait,
+ &event_pipe_stub_write_event_threadpool_min_max_threads,
&event_pipe_stub_write_event_threadpool_worker_thread_adjustment_sample,
&event_pipe_stub_write_event_threadpool_worker_thread_adjustment_adjustment,
&event_pipe_stub_write_event_threadpool_worker_thread_adjustment_stats,
@@ -400,6 +409,17 @@ event_pipe_stub_write_event_threadpool_worker_thread_wait (
}
static bool
+event_pipe_stub_write_event_threadpool_min_max_threads (
+ uint16_t min_worker_threads,
+ uint16_t max_worker_threads,
+ uint16_t min_io_completion_threads,
+ uint16_t max_io_completion_threads,
+ uint16_t clr_instance_id)
+{
+ return true;
+}
+
+static bool
event_pipe_stub_write_event_threadpool_worker_thread_adjustment_sample (
double throughput,
uint16_t clr_instance_id)
diff --git a/src/mono/mono/component/event_pipe.c b/src/mono/mono/component/event_pipe.c
index 73dfe96..32ba105 100644
--- a/src/mono/mono/component/event_pipe.c
+++ b/src/mono/mono/component/event_pipe.c
@@ -119,6 +119,7 @@ static MonoComponentEventPipe fn_table = {
&ep_rt_write_event_threadpool_worker_thread_start,
&ep_rt_write_event_threadpool_worker_thread_stop,
&ep_rt_write_event_threadpool_worker_thread_wait,
+ &ep_rt_write_event_threadpool_min_max_threads,
&ep_rt_write_event_threadpool_worker_thread_adjustment_sample,
&ep_rt_write_event_threadpool_worker_thread_adjustment_adjustment,
&ep_rt_write_event_threadpool_worker_thread_adjustment_stats,
diff --git a/src/mono/mono/component/event_pipe.h b/src/mono/mono/component/event_pipe.h
index 5e4d386..af788ac 100644
--- a/src/mono/mono/component/event_pipe.h
+++ b/src/mono/mono/component/event_pipe.h
@@ -166,6 +166,14 @@ typedef bool
uint16_t clr_instance_id);
typedef bool
+(*event_pipe_component_write_event_threadpool_min_max_threads_func)(
+ uint16_t min_worker_threads,
+ uint16_t max_worker_threads,
+ uint16_t min_io_completion_threads,
+ uint16_t max_io_completion_threads,
+ uint16_t clr_instance_id);
+
+typedef bool
(*event_pipe_component_write_event_threadpool_worker_thread_adjustment_sample_func)(
double throughput,
uint16_t clr_instance_id);
@@ -243,6 +251,7 @@ typedef struct _MonoComponentEventPipe {
event_pipe_component_write_event_threadpool_worker_thread_start_func write_event_threadpool_worker_thread_start;
event_pipe_component_write_event_threadpool_worker_thread_stop_func write_event_threadpool_worker_thread_stop;
event_pipe_component_write_event_threadpool_worker_thread_wait_func write_event_threadpool_worker_thread_wait;
+ event_pipe_component_write_event_threadpool_min_max_threads_func write_event_threadpool_min_max_threads;
event_pipe_component_write_event_threadpool_worker_thread_adjustment_sample_func write_event_threadpool_worker_thread_adjustment_sample;
event_pipe_component_write_event_threadpool_worker_thread_adjustment_adjustment_func write_event_threadpool_worker_thread_adjustment_adjustment;
event_pipe_component_write_event_threadpool_worker_thread_adjustment_stats_func write_event_threadpool_worker_thread_adjustment_stats;
diff --git a/src/mono/mono/eventpipe/ep-rt-mono.c b/src/mono/mono/eventpipe/ep-rt-mono.c
index 367d6b4..109ecb9 100644
--- a/src/mono/mono/eventpipe/ep-rt-mono.c
+++ b/src/mono/mono/eventpipe/ep-rt-mono.c
@@ -4282,6 +4282,24 @@ ep_rt_write_event_threadpool_worker_thread_wait (
}
bool
+ep_rt_write_event_threadpool_min_max_threads (
+ uint16_t min_worker_threads,
+ uint16_t max_worker_threads,
+ uint16_t min_io_completion_threads,
+ uint16_t max_io_completion_threads,
+ uint16_t clr_instance_id)
+{
+ return FireEtwThreadPoolMinMaxThreads (
+ min_worker_threads,
+ max_worker_threads,
+ min_io_completion_threads,
+ max_io_completion_threads,
+ clr_instance_id,
+ NULL,
+ NULL) == 0 ? true : false;
+}
+
+bool
ep_rt_write_event_threadpool_worker_thread_adjustment_sample (
double throughput,
uint16_t clr_instance_id)
diff --git a/src/mono/mono/eventpipe/ep-rt-mono.h b/src/mono/mono/eventpipe/ep-rt-mono.h
index 669e245..ebe81a0 100644
--- a/src/mono/mono/eventpipe/ep-rt-mono.h
+++ b/src/mono/mono/eventpipe/ep-rt-mono.h
@@ -2289,6 +2289,14 @@ ep_rt_write_event_threadpool_worker_thread_wait (
uint16_t clr_instance_id);
bool
+ep_rt_write_event_threadpool_min_max_threads (
+ uint16_t min_worker_threads,
+ uint16_t max_worker_threads,
+ uint16_t min_io_completion_threads,
+ uint16_t max_io_completion_threads,
+ uint16_t clr_instance_id);
+
+bool
ep_rt_write_event_threadpool_worker_thread_adjustment_sample (
double throughput,
uint16_t clr_instance_id);
diff --git a/src/mono/mono/eventpipe/gen-eventing-event-inc.lst b/src/mono/mono/eventpipe/gen-eventing-event-inc.lst
index 487d9d2..3ed9522 100644
--- a/src/mono/mono/eventpipe/gen-eventing-event-inc.lst
+++ b/src/mono/mono/eventpipe/gen-eventing-event-inc.lst
@@ -37,6 +37,7 @@ RuntimeInformationDCStart
ThreadCreated
ThreadPoolIODequeue
ThreadPoolIOEnqueue
+ThreadPoolMinMaxThreads
ThreadPoolWorkerThreadAdjustmentAdjustment
ThreadPoolWorkerThreadAdjustmentSample
ThreadPoolWorkerThreadAdjustmentStats
diff --git a/src/mono/mono/metadata/icall-decl.h b/src/mono/mono/metadata/icall-decl.h
index d750235..928bf83 100644
--- a/src/mono/mono/metadata/icall-decl.h
+++ b/src/mono/mono/metadata/icall-decl.h
@@ -164,6 +164,7 @@ ICALL_EXPORT void ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_
ICALL_EXPORT void ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadStart (uint32_t active_thread_count, uint32_t retired_worker_thread_count, uint16_t clr_instance_id);
ICALL_EXPORT void ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadStop (uint32_t active_thread_count, uint32_t retired_worker_thread_count, uint16_t clr_instance_id);
ICALL_EXPORT void ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadWait (uint32_t active_thread_count, uint32_t retired_worker_thread_count, uint16_t clr_instance_id);
+ICALL_EXPORT void ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolMinMaxThreads (uint16_t min_worker_threads, uint16_t max_worker_threads, uint16_t min_io_completion_threads, uint16_t max_io_completion_threads, uint16_t clr_instance_id);
ICALL_EXPORT void ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkingThreadCount (uint16_t count, uint16_t clr_instance_id);
ICALL_EXPORT void ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolIOPack (intptr_t native_overlapped, intptr_t overlapped, uint16_t clr_instance_id);
diff --git a/src/mono/mono/metadata/icall-def.h b/src/mono/mono/metadata/icall-def.h
index 8b4fb43..47395d1 100644
--- a/src/mono/mono/metadata/icall-def.h
+++ b/src/mono/mono/metadata/icall-def.h
@@ -174,6 +174,7 @@ ICALL_TYPE(NATIVE_RUNTIME_EVENT_SOURCE, "System.Diagnostics.Tracing.NativeRuntim
NOHANDLES(ICALL(NATIVE_RUNTIME_EVENT_SOURCE_1, "LogThreadPoolIODequeue", ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolIODequeue))
NOHANDLES(ICALL(NATIVE_RUNTIME_EVENT_SOURCE_2, "LogThreadPoolIOEnqueue", ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolIOEnqueue))
NOHANDLES(ICALL(NATIVE_RUNTIME_EVENT_SOURCE_10, "LogThreadPoolIOPack", ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolIOPack))
+NOHANDLES(ICALL(NATIVE_RUNTIME_EVENT_SOURCE_11, "LogThreadPoolMinMaxThreads", ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolMinMaxThreads))
NOHANDLES(ICALL(NATIVE_RUNTIME_EVENT_SOURCE_3, "LogThreadPoolWorkerThreadAdjustmentAdjustment", ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadAdjustmentAdjustment))
NOHANDLES(ICALL(NATIVE_RUNTIME_EVENT_SOURCE_4, "LogThreadPoolWorkerThreadAdjustmentSample", ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadAdjustmentSample))
NOHANDLES(ICALL(NATIVE_RUNTIME_EVENT_SOURCE_5, "LogThreadPoolWorkerThreadAdjustmentStats", ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadAdjustmentStats))
diff --git a/src/mono/mono/metadata/icall-eventpipe.c b/src/mono/mono/metadata/icall-eventpipe.c
index 4d1604a..3c5b38c 100644
--- a/src/mono/mono/metadata/icall-eventpipe.c
+++ b/src/mono/mono/metadata/icall-eventpipe.c
@@ -386,6 +386,22 @@ ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorke
}
void
+ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolMinMaxThreads (
+ uint16_t min_worker_threads,
+ uint16_t max_worker_threads,
+ uint16_t min_io_completion_threads,
+ uint16_t max_io_completion_threads,
+ uint16_t clr_instance_id)
+{
+ mono_component_event_pipe ()->write_event_threadpool_min_max_threads (
+ min_worker_threads,
+ max_worker_threads,
+ min_io_completion_threads,
+ max_io_completion_threads,
+ clr_instance_id);
+}
+
+void
ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadAdjustmentSample (
double throughput,
uint16_t clr_instance_id)
@@ -661,6 +677,19 @@ ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorke
}
void
+ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolMinMaxThreads (
+ uint16_t min_worker_threads,
+ uint16_t max_worker_threads,
+ uint16_t min_io_completion_threads,
+ uint16_t max_io_completion_threads,
+ uint16_t clr_instance_id)
+{
+ ERROR_DECL (error);
+ mono_error_set_not_implemented (error, "System.Diagnostics.Tracing.NativeRuntimeEventSource.LogThreadPoolMinMaxThreads");
+ mono_error_set_pending_exception (error);
+}
+
+void
ves_icall_System_Diagnostics_Tracing_NativeRuntimeEventSource_LogThreadPoolWorkerThreadAdjustmentSample (
double throughput,
uint16_t clr_instance_id)
--
2.7.4