From 3d0a45487752930400eb976e20ecd639ffd5d83f Mon Sep 17 00:00:00 2001 From: Andrew Au Date: Sun, 16 Aug 2020 21:36:22 -0700 Subject: [PATCH] Make the buffer size configurable for generational aware analysis --- src/coreclr/src/vm/eventpipe.cpp | 1 - src/coreclr/src/vm/finalizerthread.cpp | 2 -- src/coreclr/src/vm/gcenv.ee.standalone.cpp | 2 -- src/coreclr/src/vm/gcenv.ee.static.cpp | 2 -- src/coreclr/src/vm/genanalysis.cpp | 4 +++- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/coreclr/src/vm/eventpipe.cpp b/src/coreclr/src/vm/eventpipe.cpp index a25f6c20370a51..32e18ab75258db 100644 --- a/src/coreclr/src/vm/eventpipe.cpp +++ b/src/coreclr/src/vm/eventpipe.cpp @@ -22,7 +22,6 @@ #include "win32threadpool.h" #include "ceemain.h" #include "configuration.h" -#include "genanalysis.h" #ifdef TARGET_UNIX #include "pal.h" diff --git a/src/coreclr/src/vm/finalizerthread.cpp b/src/coreclr/src/vm/finalizerthread.cpp index facb5e4c1928e3..b7b7fc649b629a 100644 --- a/src/coreclr/src/vm/finalizerthread.cpp +++ b/src/coreclr/src/vm/finalizerthread.cpp @@ -7,8 +7,6 @@ #include "finalizerthread.h" #include "threadsuspend.h" #include "jithost.h" -#include "eventpipe.h" -#include "eventpipesession.h" #include "genanalysis.h" #ifdef FEATURE_COMINTEROP diff --git a/src/coreclr/src/vm/gcenv.ee.standalone.cpp b/src/coreclr/src/vm/gcenv.ee.standalone.cpp index 93638697aeaae0..1a79bc424536be 100644 --- a/src/coreclr/src/vm/gcenv.ee.standalone.cpp +++ b/src/coreclr/src/vm/gcenv.ee.standalone.cpp @@ -15,8 +15,6 @@ #include "gctoclreventsink.h" #include "configuration.h" -#include "eventpipe.h" -#include "eventpipesession.h" #include "genanalysis.h" // the method table for the WeakReference class diff --git a/src/coreclr/src/vm/gcenv.ee.static.cpp b/src/coreclr/src/vm/gcenv.ee.static.cpp index 63a0795f975e6e..3cc0fd4ab516d2 100644 --- a/src/coreclr/src/vm/gcenv.ee.static.cpp +++ b/src/coreclr/src/vm/gcenv.ee.static.cpp @@ -15,8 +15,6 @@ #include "gctoclreventsink.h" #include "configuration.h" -#include "eventpipe.h" -#include "eventpipesession.h" #include "genanalysis.h" // the method table for the WeakReference class diff --git a/src/coreclr/src/vm/genanalysis.cpp b/src/coreclr/src/vm/genanalysis.cpp index e679467c9ebb9c..37a2eab3521db8 100644 --- a/src/coreclr/src/vm/genanalysis.cpp +++ b/src/coreclr/src/vm/genanalysis.cpp @@ -11,6 +11,7 @@ GcGenAnalysisState gcGenAnalysisConfigured = GcGenAnalysisState::Uninitialized; int64_t gcGenAnalysisGen = -1; int64_t gcGenAnalysisBytes = 0; int64_t gcGenAnalysisIndex = 0; +uint32_t gcGenAnalysisBufferMB = 0; /* static */ void GenAnalysis::Initialize() { @@ -27,6 +28,7 @@ int64_t gcGenAnalysisIndex = 0; { gcGenAnalysisIndex = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_GCGenAnalysisIndex); gcGenAnalysisConfigured = GcGenAnalysisState::Enabled; + gcGenAnalysisBufferMB = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_EventPipeCircularMB); } else { @@ -61,7 +63,7 @@ int64_t gcGenAnalysisIndex = 0; pProviders[0] = EventPipeProviderConfiguration(W("Microsoft-Windows-DotNETRuntime"), keyword, 5, nullptr); gcGenAnalysisEventPipeSessionId = EventPipe::Enable( outputPath, - 1024, + gcGenAnalysisBufferMB, pProviders, providerCnt, EventPipeSessionType::File,