summaryrefslogtreecommitdiff
path: root/src/vm
diff options
context:
space:
mode:
authorAndrew Au <andrewau@microsoft.com>2019-05-06 12:04:13 -0700
committerAndrew Au <cshung@gmail.com>2019-05-06 14:45:25 -0700
commit0604a6e996f8cce5d3fb43b2a3e80cef0bf5dc4a (patch)
tree31dc27754fac14695501202272a695f7a72b4d4c /src/vm
parent5a56dde8b02f846df4eb148310a6f8dc51fe2110 (diff)
downloadcoreclr-0604a6e996f8cce5d3fb43b2a3e80cef0bf5dc4a.tar.gz
coreclr-0604a6e996f8cce5d3fb43b2a3e80cef0bf5dc4a.tar.bz2
coreclr-0604a6e996f8cce5d3fb43b2a3e80cef0bf5dc4a.zip
Launch DiagnosticServer after EEStartup
Diffstat (limited to 'src/vm')
-rw-r--r--src/vm/ceemain.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp
index a0b1032207..1420b598a6 100644
--- a/src/vm/ceemain.cpp
+++ b/src/vm/ceemain.cpp
@@ -664,7 +664,6 @@ void EEStartupHelper(COINITIEE fFlags)
#ifdef FEATURE_PERFTRACING
// Initialize the event pipe.
EventPipe::Initialize();
- DiagnosticServer::Initialize();
#endif // FEATURE_PERFTRACING
#ifdef FEATURE_GDBJIT
@@ -999,6 +998,11 @@ void EEStartupHelper(COINITIEE fFlags)
#endif // CROSSGEN_COMPILE
g_fEEStarted = TRUE;
+#ifndef CROSSGEN_COMPILE
+#ifdef FEATURE_PERFTRACING
+ DiagnosticServer::Initialize();
+#endif
+#endif
g_EEStartupStatus = S_OK;
hr = S_OK;
STRESS_LOG0(LF_STARTUP, LL_ALWAYS, "===================EEStartup Completed===================");