Disable HeapDump on Linux if FEATURE_EVENT_TRACE is not set (#5550)

This commit tries to disable heap dump on linux if FEATURE_EVENT_TRACE
is not set in order to fix #5546.

diff --git a/src/vm/finalizerthread.cpp b/src/vm/finalizerthread.cpp
index 5fe0b48..3960719 100644 (file)
--- a/src/vm/finalizerthread.cpp
+++ b/src/vm/finalizerthread.cpp
@@ -23,7 +23,7 @@
 BOOL FinalizerThread::fRunFinalizersOnUnload = FALSE;
 BOOL FinalizerThread::fQuitFinalizer = FALSE;
 
-#if defined(__linux__)
+#if defined(__linux__) && defined(FEATURE_EVENT_TRACE)
 #define LINUX_HEAP_DUMP_TIME_OUT 10000
 
 extern bool s_forcedGCInProgress;
@@ -519,7 +519,7 @@ void FinalizerThread::WaitForFinalizerEvent (CLREvent *event)
                 cEventsForWait,                           // # objects to wait on
                 &(MHandles[uiEventIndexOffsetForWait]),   // array of objects to wait on
                 FALSE,          // bWaitAll == FALSE, so wait for first signal
-#if defined(__linux__)
+#if defined(__linux__) && defined(FEATURE_EVENT_TRACE)
                 LINUX_HEAP_DUMP_TIME_OUT,
 #else
                 INFINITE,       // timeout
@@ -554,7 +554,7 @@ void FinalizerThread::WaitForFinalizerEvent (CLREvent *event)
                 ProfilingAPIAttachDetach::ProcessSignaledAttachEvent();
                 break;
 #endif // FEATURE_PROFAPI_ATTACH_DETACH
-#if defined(__linux__)
+#if defined(__linux__) && defined(FEATURE_EVENT_TRACE)
             case (WAIT_TIMEOUT + kLowMemoryNotification):
             case (WAIT_TIMEOUT + kFinalizer):
                 if (g_TriggerHeapDump)
@@ -574,7 +574,7 @@ void FinalizerThread::WaitForFinalizerEvent (CLREvent *event)
     else {
         static LONG sLastLowMemoryFromHost = 0;
         while (1) {
-#if defined(__linux__)
+#if defined(__linux__) && defined(FEATURE_EVENT_TRACE)
             DWORD timeout = LINUX_HEAP_DUMP_TIME_OUT;
 #else
             DWORD timeout = INFINITE;
@@ -613,7 +613,7 @@ void FinalizerThread::WaitForFinalizerEvent (CLREvent *event)
             case (WAIT_ABANDONED):
                 return;
             case (WAIT_TIMEOUT):
-#if defined(__linux__)
+#if defined(__linux__) && defined(FEATURE_EVENT_TRACE)
                 if (g_TriggerHeapDump)
                 {
                     return;
@@ -672,7 +672,7 @@ VOID FinalizerThread::FinalizerThreadWorker(void *args)
 
         WaitForFinalizerEvent (hEventFinalizer);
 
-#if defined(__linux__)
+#if defined(__linux__) && defined(FEATURE_EVENT_TRACE)
         if (g_TriggerHeapDump && (CLRGetTickCount64() > (LastHeapDumpTime + LINUX_HEAP_DUMP_TIME_OUT)))
         {
             s_forcedGCInProgress = true;

diff --git a/src/vm/finalizerthread.h b/src/vm/finalizerthread.h
index c3b6e71..42a9e9f 100644 (file)
--- a/src/vm/finalizerthread.h
+++ b/src/vm/finalizerthread.h
@@ -12,7 +12,7 @@ class FinalizerThread
     static BOOL fQuitFinalizer;
     static AppDomain *UnloadingAppDomain;
     
-#if defined(__linux__)
+#if defined(__linux__) && defined(FEATURE_EVENT_TRACE)
     static ULONGLONG LastHeapDumpTime;
 #endif
 

diff --git a/src/vm/vars.hpp b/src/vm/vars.hpp
index 1b51c47..2394ef6 100644 (file)
--- a/src/vm/vars.hpp
+++ b/src/vm/vars.hpp
@@ -605,7 +605,7 @@ extern ULONGLONG g_ObjFinalizeStartTime;
 extern Volatile<BOOL> g_FinalizerIsRunning;
 extern Volatile<ULONG> g_FinalizerLoopCount;
 
-#ifdef FEATURE_PAL
+#if defined(FEATURE_PAL) && defined(FEATURE_EVENT_TRACE)
 extern Volatile<BOOL> g_TriggerHeapDump;
 #endif // FEATURE_PAL