allow graceful shutdown of dmdserver via SIGTERM, related to #66

Author: mkalkbrenner

CMakeLists.txt

@@ -75,6 +75,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 
       add_compile_options(-fsanitize=undefined)
       add_link_options(-fsanitize=undefined)
+
+      add_compile_options(-fno-omit-frame-pointer)
    endif()
 endif()
 

platforms/config.sh

@@ -3,7 +3,7 @@
 set -e
 
 LIBZEDMD_SHA=154772800e8f36378c629f066bfee563862728ac
-LIBSERUM_SHA=34e8ad23837b30acaade1e9aaa773d8ea3340622
+LIBSERUM_SHA=1f555fa686ba473f4e2d9a05a21f0dc292103032
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 
 if [ -z "${BUILD_TYPE}" ]; then

src/DMD.cpp

@@ -1088,7 +1088,12 @@ void DMD::SerumThread()
               Serum_SetIgnoreUnknownFramesTimeout(Config::GetInstance()->GetIgnoreUnknownFramesTimeout());
               Serum_SetMaximumUnknownFramesToSkip(Config::GetInstance()->GetMaximumUnknownFramesToSkip());
 
-              if (m_dumpPath[strlen(m_altColorPath) - 1] == '/' || m_dumpPath[strlen(m_altColorPath) - 1] == '\\')
+              size_t pathLen = strlen(m_altColorPath);
+              if (pathLen == 0)
+              {
+                snprintf(csvPath, sizeof(csvPath), "./%s.pup.csv", m_romName);
+              }
+              else if (m_altColorPath[pathLen - 1] == '/' || m_altColorPath[pathLen - 1] == '\\')
               {
                 snprintf(csvPath, sizeof(csvPath), "%s%s/%s.pup.csv", m_altColorPath, m_romName, m_romName);
               }
@@ -1859,7 +1864,12 @@ void DMD::DumpDMDTxtThread()
             char suffix[9];  // 8 chars + null terminator
             GenerateRandomSuffix(suffix, 8);
             if (m_dumpPath[0] == '\0') strcpy(m_dumpPath, Config::GetInstance()->GetDumpPath());
-            if (m_dumpPath[strlen(m_dumpPath) - 1] == '/' || m_dumpPath[strlen(m_dumpPath) - 1] == '\\')
+            size_t pathLen = strlen(m_dumpPath);
+            if (pathLen == 0)
+            {
+              snprintf(filename, sizeof(filename), "./%s-%s.txt", m_dumpPath, name, suffix);
+            }
+            else if (m_dumpPath[pathLen - 1] == '/' || m_dumpPath[pathLen - 1] == '\\')
             {
               snprintf(filename, sizeof(filename), "%s%s-%s.txt", m_dumpPath, name, suffix);
             }

src/DMDServer.cpp

@@ -37,6 +37,8 @@ bool DMDServer::Start(const char* addr, in_port_t port)
     return false;
   }
 
+  m_acceptor.set_non_blocking();
+
   m_running.store(true, std::memory_order_release);
   m_acceptThread = new std::thread(&DMDServer::AcceptLoop, this);
   return true;
@@ -56,25 +58,27 @@ void DMDServer::Stop()
   std::unique_lock<std::mutex> lock(m_threadMutex);
   m_currentThreadId = 0;
   m_disconnectOtherClients = 0;
+  lock.unlock();
 }
 
 void DMDServer::AcceptLoop()
 {
   uint32_t threadId = 0;
 
-  (void)m_running.load(std::memory_order_acquire);
-
   while (m_running.load(std::memory_order_relaxed))
   {
     sockpp::inet_address peer;
     sockpp::tcp_socket sock = m_acceptor.accept(&peer);
 
     if (!sock)
     {
-      if (m_acceptor.last_error() != EWOULDBLOCK)
+      if (m_acceptor.last_error() == EWOULDBLOCK)
       {
-        Log(DMDUtil_LogLevel_ERROR, "Error accepting connection: %s", m_acceptor.last_error_str().c_str());
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        continue;
       }
+
+      Log(DMDUtil_LogLevel_ERROR, "Error accepting connection: %s", m_acceptor.last_error_str().c_str());
       continue;
     }
 
@@ -90,20 +94,38 @@ void DMDServer::AcceptLoop()
 
 void DMDServer::ClientThread(sockpp::tcp_socket sock, uint32_t threadId)
 {
+  // Socket auf non-blocking setzen
+  sock.set_non_blocking();
+
   uint8_t buffer[sizeof(DMDUtil::DMD::Update)];
   DMDUtil::DMD::StreamHeader* pStreamHeader = (DMDUtil::DMD::StreamHeader*)malloc(sizeof(DMDUtil::DMD::StreamHeader));
   ssize_t n;
-  // Disconnect others is only allowed once per client.
   bool handleDisconnectOthers = true;
   bool logged = false;
 
   DMDUtil::Log(DMDUtil_LogLevel_INFO, "%d: New DMD client %d connected", threadId, threadId);
 
-  while (threadId == m_currentThreadId || m_disconnectOtherClients == 0 || m_disconnectOtherClients <= threadId)
+  while (m_running.load(std::memory_order_relaxed) &&
+         (threadId == m_currentThreadId || m_disconnectOtherClients == 0 || m_disconnectOtherClients <= threadId))
   {
     n = sock.read_n(buffer, sizeof(DMDUtil::DMD::StreamHeader));
-    // If the client disconnects or if a network error ocurres, exit the loop and terminate this thread.
-    if (n <= 0) break;
+
+    if (n < 0)
+    {
+      if (sock.last_error() == EWOULDBLOCK)
+      {
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        continue;
+      }
+
+      // network error or connection closed
+      break;
+    }
+    else if (n == 0)
+    {
+      // connection closed by client
+      break;
+    }
 
     if (n == sizeof(DMDUtil::DMD::StreamHeader))
     {

src/server.cpp

@@ -1,3 +1,5 @@
+#include <signal.h>
+
 #include "DMDUtil/DMDUtil.h"
 #include "Logger.h"
 #include "cargs.h"
@@ -7,6 +9,7 @@ using namespace std;
 bool opt_verbose = false;
 bool opt_fixedAltColorPath = false;
 bool opt_fixedPupPath = false;
+static volatile bool running = true;
 
 static struct cag_option options[] = {
     {.identifier = 'c',
@@ -59,13 +62,28 @@ void DMDUTILCALLBACK LogCallback(DMDUtil_LogLevel logLevel, const char* format,
   fprintf(stderr, "%s\n", buffer);
 }
 
+// Signal Handler für graceful shutdown
+void SignalHandler(int signum)
+{
+  if (signum == SIGTERM)
+  {
+    DMDUtil::Log(DMDUtil_LogLevel_INFO, "Received SIGTERM, shutting down...");
+    running = false;
+  }
+}
+
 int main(int argc, char* argv[])
 {
+  // Signal Handler registrieren
+  signal(SIGTERM, SignalHandler);
+
   DMDUtil::Config* pConfig = DMDUtil::Config::GetInstance();
   pConfig->SetDMDServer(false);  // This is the server. It must not connect to a different server!
 
   cag_option_context cag_context;
   bool opt_wait = false;
+  bool opt_fixedAltColorPath = false;
+  bool opt_fixedPupPath = false;
 
   cag_option_init(&cag_context, options, CAG_ARRAY_SIZE(options), argc, argv);
   while (cag_option_fetch(&cag_context))
@@ -79,10 +97,12 @@ int main(int argc, char* argv[])
     else if (identifier == 'o')
     {
       pConfig->SetAltColorPath(cag_option_get_value(&cag_context));
+      opt_fixedAltColorPath = true;
     }
     else if (identifier == 'u')
     {
       pConfig->SetPUPVideosPath(cag_option_get_value(&cag_context));
+      opt_fixedPupPath = true;
     }
     else if (identifier == 'a')
     {
@@ -141,14 +161,14 @@ int main(int argc, char* argv[])
     opt_fixedAltColorPath = true;
   }
 
-  DMDUtil::DMDServer server(pDmd);
+  DMDUtil::DMDServer server(pDmd, opt_fixedAltColorPath, opt_fixedPupPath);
 
   if (!server.Start(pConfig->GetDMDServerAddr(), pConfig->GetDMDServerPort()))
   {
     return 1;
   }
 
-  while (server.IsRunning() && pDmd->HasDisplay())
+  while (running && server.IsRunning() && pDmd->HasDisplay())
   {
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
   }