diff options
| author | Vance Morrison <vancem@microsoft.com> | 2016-09-12 15:16:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 15:16:59 -0700 |
| commit | 7d5bc8321058c6fce4a511e96ff4059171124ff3 (patch) | |
| tree | 862c1a1c92091e627c4f5b24fa67b5743a2d00a9 /src | |
| parent | 762833dae43d312a3693b6a767771200e476fed9 (diff) | |
| parent | 1d5c43f1da75b36707133a1a86666373938dfe40 (diff) | |
| download | coreclr-7d5bc8321058c6fce4a511e96ff4059171124ff3.tar.gz coreclr-7d5bc8321058c6fce4a511e96ff4059171124ff3.tar.bz2 coreclr-7d5bc8321058c6fce4a511e96ff4059171124ff3.zip | |
Merge pull request #7102 from vancem/ETWGCDumpFix.9-7-16
Fix Issue dumping GC heap with ETW more than once
Diffstat (limited to 'src')
| -rw-r--r-- | src/vm/eventtrace.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp index b126fb07a4..fbb292b777 100644 --- a/src/vm/eventtrace.cpp +++ b/src/vm/eventtrace.cpp @@ -4468,6 +4468,12 @@ extern "C" BOOLEAN bIsRundownTraceHandle = (context->RegistrationHandle==Microsoft_Windows_DotNETRuntimeRundownHandle); + // TypeSystemLog needs a notification when certain keywords are modified, so + // give it a hook here. + if (g_fEEStarted && !g_fEEShutDown && bIsPublicTraceHandle) + { + ETW::TypeSystemLog::OnKeywordsChanged(); + } // A manifest based provider can be enabled to multiple event tracing sessions // As long as there is atleast 1 enabled session, IsEnabled will be TRUE @@ -4478,13 +4484,6 @@ extern "C" (ControlCode == EVENT_CONTROL_CODE_CAPTURE_STATE)); if(bEnabled) { - // TypeSystemLog needs a notification when certain keywords are modified, so - // give it a hook here. - if (g_fEEStarted && !g_fEEShutDown && bIsPublicTraceHandle) - { - ETW::TypeSystemLog::OnKeywordsChanged(); - } - if (bIsPrivateTraceHandle) { ETW::GCLog::GCSettingsEvent(); |