feat(crashreporter): Abort Listener

Author: skuzzis

src/crashreporter/CrashReport.cpp

@@ -19,6 +19,7 @@ bool BeginCrashListener() { return true; }
 #include <sstream>
 
 #include <random>
+#include <atomic>
 
 #include "../files/Files.h"
 #include "../common.h"
@@ -28,6 +29,8 @@ std::string startup_cmd = "None";
 
 const char *ws = " \t\n\r\f\v";
 
+std::atomic<bool> exitProgram(false);
+
 // trim from end of string (right)
 inline std::string &rtrim(std::string &s, const char *t = ws)
 {
@@ -161,7 +164,7 @@ void signal_handler(int signumber)
         PLUGIN_PRINTF("Crash Reporter", "Error crash handling: %s\n", e.what());
     }
 
-    exit(EXIT_FAILURE);
+    exitProgram = true;
 }
 
 bool BeginCrashListener()
@@ -176,11 +179,12 @@ bool BeginCrashListener()
     }
 
     ::signal(SIGSEGV, &signal_handler);
+    ::signal(SIGABRT, &signal_handler);
 
     startup_cmd = CommandLine()->GetCmdLine();
     std::vector<std::string> exp = explode(startup_cmd, " ");
     std::vector<std::string> exp2;
-    for (int i = 1; i < exp.size(); i++)
+    for (std::size_t i = 1; i < exp.size(); i++)
     {
         std::string str = trim(exp[i]);
         if (str.length() == 0)
@@ -196,4 +200,10 @@ bool BeginCrashListener()
     return true;
 }
 
+void CrashReporterListener()
+{
+    if (exitProgram.load())
+        exit(EXIT_FAILURE);
+}
+
 #endif

src/entrypoint.cpp

@@ -350,11 +350,17 @@ GameFrameMsgPackCache gameFrameCache = {
     false,
 };
 
+void CrashReporterListener();
+
 void Swiftly::Hook_GameFrame(bool simulating, bool bFirstTick, bool bLastTick)
 {
     PERF_RECORD("GameFrame", "core")
     static double g_flNextUpdate = 0.0;
 
+    //////////////////////////////////////////////////////////////
+    /////////////////         Server List          //////////////
+    ////////////////////////////////////////////////////////////
+
     double curtime = Plat_FloatTime();
     if (curtime > g_flNextUpdate)
     {
@@ -364,6 +370,12 @@ void Swiftly::Hook_GameFrame(bool simulating, bool bFirstTick, bool bLastTick)
         g_flNextUpdate = curtime + 5.0;
     }
 
+    //////////////////////////////////////////////////////////////
+    /////////////////        Crash Reporter        //////////////
+    ////////////////////////////////////////////////////////////
+
+    CrashReporterListener();
+
     //////////////////////////////////////////////////////////////
     /////////////////         Game Event           //////////////
     ////////////////////////////////////////////////////////////