Changeset 103055 in vbox for trunk/src/libs

Timestamp:

Jan 25, 2024 10:03:13 AM (12 months ago)

Author:

vboxsync

Message:

libs/xpcom/ipcd: Fix regression introduced with r160171.

With r160171 the IPC client array is not compact anymore but can contain holes
due to the index being used as the pollset identifier for faster access.
Some functions in ipcd.cpp however use the current client count and traverse the
client array for some messages (broadcasts, client up, client down, etc.).
This doesn't work with holes in the array if a client spawned before another one
is shut down, so all later clients wouldn't receive those messages anymore.
Fix this exposing a doubly linked list of clients which allows to traverse all
connected clients without having to use the client connection counter.

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src

Files:

• ipcClient.h (modified) (2 diffs)
• ipcd.cpp (modified) (6 diffs)
• ipcdPrivate.h (modified) (2 diffs)
• ipcdUnix.cpp (modified) (4 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcClient.h

@@ -39 +39 @@
 #define ipcClientUnix_h__
 
+#include <iprt/list.h>
 #include <iprt/socket.h>
 
@@ -56 +57 @@
 {
 public:
+    /** Node for the list of clients. */
+    RTLISTNODE NdClients;
     bool     m_fUsed;
     uint32_t m_idPoll;

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcd.cpp

@@ -104 +104 @@
         // broadcast
         //
-        for (int i=0; i<ipcClientCount; ++i)
-            IPC_SendMsg(&ipcClients[i], msg->Clone());
+        ipcClient *pIt;
+        RTListForEachCpp(&g_LstIpcClients, pIt, ipcClient, NdClients)
+        {
+            IPC_SendMsg(pIt, msg->Clone());
+        }
         delete msg;
         return PR_SUCCESS;
@@ -128 +131 @@
     Log(("IPC_NotifyClientUp: clientID=%d\n", client->ID()));
 
-    for (int i=0; i<ipcClientCount; ++i) {
-        if (&ipcClients[i] != client)
-            IPC_SendMsg(&ipcClients[i],
+    ipcClient *pIt;
+    RTListForEachCpp(&g_LstIpcClients, pIt, ipcClient, NdClients)
+    {
+        if (pIt != client)
+            IPC_SendMsg(pIt,
                 new ipcmMessageClientState(client->ID(), IPCM_CLIENT_STATE_UP));
     }
@@ -140 +145 @@
     Log(("IPC_NotifyClientDown: clientID=%d\n", client->ID()));
 
-    for (int i=0; i<ipcClientCount; ++i) {
-        if (&ipcClients[i] != client)
-            IPC_SendMsg(&ipcClients[i],
+    ipcClient *pIt;
+    RTListForEachCpp(&g_LstIpcClients, pIt, ipcClient, NdClients)
+    {
+        if (pIt != client)
+            IPC_SendMsg(pIt,
                 new ipcmMessageClientState(client->ID(), IPCM_CLIENT_STATE_DOWN));
     }
@@ -161 +168 @@
 {
     // linear search OK since number of clients should be small
-    for (int i = 0; i < ipcClientCount; ++i) {
-        if (ipcClients[i].ID() == clientID)
-            return &ipcClients[i];
+    ipcClient *pIt;
+    RTListForEachCpp(&g_LstIpcClients, pIt, ipcClient, NdClients)
+    {
+        if (pIt->ID() == clientID)
+            return pIt;
     }
     return NULL;
@@ -172 +181 @@
 {
     // linear search OK since number of clients should be small
-    for (int i = 0; i < ipcClientCount; ++i) {
-        if (ipcClients[i].HasName(name))
-            return &ipcClients[i];
+    ipcClient *pIt;
+    RTListForEachCpp(&g_LstIpcClients, pIt, ipcClient, NdClients)
+    {
+        if (pIt->HasName(name))
+            return pIt;
     }
     return NULL;
@@ -183 +194 @@
 {
     Assert(func);
-    for (int i = 0; i < ipcClientCount; ++i) {
-        if (func(closure, &ipcClients[i], ipcClients[i].ID()) == PR_FALSE)
+    ipcClient *pIt;
+    RTListForEachCpp(&g_LstIpcClients, pIt, ipcClient, NdClients)
+    {
+        if (func(closure, pIt, pIt->ID()) == PR_FALSE)
             break;
     }

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdPrivate.h

@@ -39 +39 @@
 #define ipcdPrivate_h__
 
+#include <iprt/cdefs.h>
+#include <iprt/list.h>
+
 class ipcClient;
 
@@ -47 +50 @@
 #define IPC_MAX_CLIENTS 10000
 
-//
-// array of connected clients
-//
-extern ipcClient *ipcClients;
-extern int        ipcClientCount;
+/** List of connected IPC clients. */
+extern RTLISTANCHOR g_LstIpcClients;
 
 //

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

@@ -265 +265 @@
 // declared in ipcdPrivate.h
 //
-ipcClient *ipcClients = NULL;
-int        ipcClientCount = 0;
+DECL_HIDDEN_DATA(RTLISTANCHOR) g_LstIpcClients;
+static int                     ipcClientCount = 0;
 
 //
@@ -296 +296 @@
             if (RT_SUCCESS(vrc))
             {
+                RTListAppend(&g_LstIpcClients, &ipcClientArray[i].NdClients);
                 ipcClientCount++;
                 return 0;
@@ -314 +315 @@
     AssertRC(vrc); RT_NOREF(vrc);
 
+    RTListNodeRemove(&ipcClientArray[idClient].NdClients);
     ipcClientArray[idClient].Finalize();
     --ipcClientCount;
@@ -323 +325 @@
 static void PollLoop(RTPOLLSET hPollSet, int fdListen)
 {
-    ipcClients = ipcClientArray;
+    RTListInit(&g_LstIpcClients);
 
     for (;;)