Fix false-positive OOM reports

kstenerud · Oct 11, 2024 · 1a0d43a · 1a0d43a
1 parent c72327c
commit 1a0d43a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/Sources/KSCrashRecording/Monitors/KSCrashMonitor_Memory.h b/Sources/KSCrashRecording/Monitors/KSCrashMonitor_Memory.h
@@ -121,6 +121,12 @@ void ksmemory_set_fatal_reports_enabled(bool enabled);
  */
 bool ksmemory_get_fatal_reports_enabled(void);
 
+/** Notifies memory monitoring logic that there was an unhandled fatal signal.
+ *  E.g. SIGTERM is not considered as a crash by-default but ignoring this signal
+ *  causes false-positive OOM reports.
+ */
+void ksmemory_notifyUnhandledFatalSignal(void);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/Sources/KSCrashRecording/Monitors/KSCrashMonitor_Memory.m b/Sources/KSCrashRecording/Monitors/KSCrashMonitor_Memory.m
@@ -569,3 +569,5 @@ bool ksmemory_previous_session_was_terminated_due_to_memory(bool *userPerceptibl
 void ksmemory_set_fatal_reports_enabled(bool enabled) { g_FatalReportsEnabled = enabled; }
 
 bool ksmemory_get_fatal_reports_enabled(void) { return g_FatalReportsEnabled; }
+
+void ksmemory_notifyUnhandledFatalSignal(void) { g_memory->fatal = true; }
diff --git a/Sources/KSCrashRecording/Monitors/KSCrashMonitor_Signal.c b/Sources/KSCrashRecording/Monitors/KSCrashMonitor_Signal.c
@@ -30,6 +30,7 @@
 #include "KSCrashMonitorContextHelper.h"
 #include "KSCrashMonitorHelper.h"
 #include "KSCrashMonitor_MachException.h"
+#include "KSCrashMonitor_Memory.h"
 #include "KSID.h"
 #include "KSMachineContext.h"
 #include "KSSignalInfo.h"
@@ -71,6 +72,7 @@ static char g_eventID[37];
 #pragma mark - Private -
 // ============================================================================
 
+static void uninstallSignalHandler(void);
 static bool shouldHandleSignal(int sigNum) { return !(sigNum == SIGTERM && !g_sigterm_monitoringEnabled); }
 
 // ============================================================================
@@ -117,6 +119,9 @@ static void handleSignal(int sigNum, siginfo_t *signalInfo, void *userContext)
 
         kscm_handleException(crashContext);
         ksmc_resumeEnvironment(threads, numThreads);
+    } else {
+        uninstallSignalHandler();
+        ksmemory_notifyUnhandledFatalSignal();
     }
 
     KSLOG_DEBUG("Re-raising signal for regular handlers to catch.");