v0.6.0, solved client disconnect edge cases in dmdserver

vpinball · Apr 5, 2024 · 57efef3 · 57efef3
1 parent ce648da
commit 57efef3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 12 deletions.
diff --git a/include/DMDUtil/DMD.h b/include/DMDUtil/DMD.h
@@ -178,6 +178,7 @@ class DMDUTILAPI DMD
   std::vector<RGB24DMD*> m_rgb24DMDs;
   std::vector<ConsoleDMD*> m_consoleDMDs;
   sockpp::tcp_connector* m_pDMDServerConnector;
+  bool m_dmdServerDisconnectOthers = false;
 
   std::thread* m_pLevelDMDThread;
   std::thread* m_pRGB24DMDThread;

diff --git a/include/DMDUtil/DMDUtil.h b/include/DMDUtil/DMDUtil.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define DMDUTIL_VERSION_MAJOR 0  // X Digits
-#define DMDUTIL_VERSION_MINOR 5  // Max 2 Digits
+#define DMDUTIL_VERSION_MINOR 6  // Max 2 Digits
 #define DMDUTIL_VERSION_PATCH 0  // Max 2 Digits
 
 #define _DMDUTIL_STR(x) #x

diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -333,13 +333,16 @@ void DMD::QueueUpdate(Update dmdUpdate, bool buffered)
         {
           StreamHeader streamHeader;
           streamHeader.buffered = (uint8_t)buffered;
+          streamHeader.disconnectOthers = (uint8_t)m_dmdServerDisconnectOthers;
           m_pDMDServerConnector->write_n(&streamHeader, sizeof(StreamHeader));
           PathsHeader pathsHeader;
           strcpy(pathsHeader.name, m_romName);
           strcpy(pathsHeader.altColorPath, m_altColorPath);
           strcpy(pathsHeader.pupVideosPath, m_pupVideosPath);
           m_pDMDServerConnector->write_n(&pathsHeader, sizeof(PathsHeader));
           m_pDMDServerConnector->write_n(&dmdUpdate, sizeof(Update));
+
+          if (streamHeader.disconnectOthers != 0) m_dmdServerDisconnectOthers = false;
         }
       })
       .detach();
@@ -527,6 +530,9 @@ void DMD::DmdFrameThread()
     {
       strcpy(name, m_romName);
 
+      // In case of a new ROM, try to disconnect the other clients.
+      if (m_pDMDServerConnector) m_dmdServerDisconnectOthers = true;
+
       if (Config::GetInstance()->IsAltColor())
       {
         m_serumMutex.lock();

diff --git a/src/dmdServer.cpp b/src/dmdServer.cpp
@@ -20,7 +20,7 @@ using namespace std;
 DMDUtil::DMD* pDmd;
 uint32_t currentThreadId = 0;
 mutex threadMutex;
-bool disconnectOtherClients = false;
+uint32_t disconnectOtherClients = 0;
 vector<uint32_t> threads;
 bool opt_verbose = false;
 bool opt_fixedAltColorPath = false;
@@ -87,7 +87,7 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
 
   if (opt_verbose) DMDUtil::Log("%d: New DMD client %d connected", threadId, threadId);
 
-  while (threadId == currentThreadId || !disconnectOtherClients)
+  while (threadId == currentThreadId || disconnectOtherClients == 0 || 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.
@@ -104,14 +104,15 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
         {
           DMDUtil::Log("%d: Received DMDStream header version %d for DMD mode %d", threadId, pStreamHeader->version,
                        pStreamHeader->mode);
-          if (pStreamHeader->buffered) DMDUtil::Log("%d: Next data will be buffered", threadId);
+          if (pStreamHeader->buffered && threadId == currentThreadId)
+            DMDUtil::Log("%d: Next data will be buffered", threadId);
         }
 
         // Only the current (most recent) thread is allowed to disconnect other clients.
         if (handleDisconnectOthers && threadId == currentThreadId && pStreamHeader->disconnectOthers)
         {
           threadMutex.lock();
-          disconnectOtherClients = true;
+          disconnectOtherClients = threadId;
           threadMutex.unlock();
           handleDisconnectOthers = false;
           if (opt_verbose) DMDUtil::Log("%d: Other clients will be disconnected", threadId);
@@ -120,8 +121,7 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
         switch (pStreamHeader->mode)
         {
           case DMDUtil::DMD::Mode::Data:
-            if ((n = sock.read_n(buffer, sizeof(DMDUtil::DMD::PathsHeader))) == sizeof(DMDUtil::DMD::PathsHeader) &&
-                threadId == currentThreadId)
+            if ((n = sock.read_n(buffer, sizeof(DMDUtil::DMD::PathsHeader))) == sizeof(DMDUtil::DMD::PathsHeader))
             {
               DMDUtil::DMD::PathsHeader pathsHeader;
               memcpy(&pathsHeader, buffer, n);
@@ -131,7 +131,7 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
                   threadId == currentThreadId)
               {
                 if (opt_verbose)
-                  DMDUtil::Log("%d: Received AltColor header: ROM '%s', AltColorPath '%s', PupPath '%s'", threadId,
+                  DMDUtil::Log("%d: Received paths header: ROM '%s', AltColorPath '%s', PupPath '%s'", threadId,
                                pathsHeader.name, pathsHeader.altColorPath, pathsHeader.pupVideosPath);
                 DMDUtil::DMD::Update data;
                 memcpy(&data, buffer, n);
@@ -149,9 +149,13 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
                   DMDUtil::Log("%d: TCP data package is missing or corrupted!", threadId);
                 }
               }
+              else if (threadId != currentThreadId)
+              {
+                DMDUtil::Log("%d: Client %d blocks the DMD", threadId, currentThreadId);
+              }
               else
               {
-                DMDUtil::Log("%d: AltColor header is missing!", threadId);
+                DMDUtil::Log("%d: Paths header is missing!", threadId);
               }
             }
             break;
@@ -167,6 +171,10 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
               pDmd->UpdateRGB16Data((uint16_t*)buffer, pStreamHeader->width, pStreamHeader->height,
                                     pStreamHeader->buffered == 1);
             }
+            else if (threadId != currentThreadId)
+            {
+              DMDUtil::Log("%d: Client %d blocks the DMD", threadId, currentThreadId);
+            }
             else
             {
               DMDUtil::Log("%d: TCP data package is missing or corrupted!", threadId);
@@ -180,6 +188,10 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
             {
               pDmd->UpdateRGB24Data(buffer, pStreamHeader->width, pStreamHeader->height, pStreamHeader->buffered == 1);
             }
+            else if (threadId != currentThreadId)
+            {
+              DMDUtil::Log("%d: Client %d blocks the DMD", threadId, currentThreadId);
+            }
             else
             {
               DMDUtil::Log("%d: TCP data package is missing or corrupted!", threadId);
@@ -198,6 +210,9 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
     }
   }
 
+  if (opt_verbose && disconnectOtherClients != 0 && disconnectOtherClients > threadId)
+    DMDUtil::Log("%d: Client %d requested disconnect", threadId, disconnectOtherClients);
+
   // Display a buffered frame or clear the display on disconnect of the current thread.
   if (threadId == currentThreadId && !pStreamHeader->buffered && !pDmd->QueueBuffer())
   {
@@ -212,7 +227,7 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
   threads.erase(remove(threads.begin(), threads.end(), threadId), threads.end());
   if (threadId == currentThreadId)
   {
-    if (disconnectOtherClients)
+    if (disconnectOtherClients == threadId)
     {
       // Wait until all other threads ended or a new client connnects in between.
       while (threads.size() >= 1 && currentThreadId == threadId)
@@ -224,14 +239,14 @@ void run(sockpp::tcp_socket sock, uint32_t threadId)
       }
 
       currentThreadId = 0;
-      disconnectOtherClients = false;
+      disconnectOtherClients = 0;
     }
     else
     {
       currentThreadId = (threads.size() >= 1) ? threads.back() : 0;
     }
 
-    if (opt_verbose) DMDUtil::Log("%d: DMD client %d set as current", currentThreadId, currentThreadId);
+    if (opt_verbose) DMDUtil::Log("%d: DMD client %d set as current", threadId, currentThreadId);
   }
   threadMutex.unlock();
 
@@ -364,6 +379,7 @@ int main(int argc, char* argv[])
       currentThreadId = ++threadId;
       threads.push_back(currentThreadId);
       threadMutex.unlock();
+      if (opt_verbose) DMDUtil::Log("%d: DMD client %d set as current", threadId, currentThreadId);
       // Create a thread and transfer the new stream to it.
       thread thr(run, std::move(sock), currentThreadId);
       thr.detach();