Changeset 101888 in vbox

Timestamp:

Nov 6, 2023 6:33:11 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Continue converting some code to use IPRT exclusively, ipcConnectionUnix.cpp uses RTPipe* for the wakeup event now instead of the PR_NewPollableEvent() API and friends, was the last user of this API, bugref:10545

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcConnectionUnix.cpp (modified) (8 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcConnectionUnix.cpp

@@ -51 +51 @@
 # include <iprt/env.h>
 # include <iprt/log.h>
+# include <iprt/mem.h>
+# include <iprt/pipe.h>
+# include <iprt/string.h>
 # include <iprt/thread.h>
 
@@ -116 +119 @@
 //-----------------------------------------------------------------------------
 
+/* Character written for wakeup. */
+static const char magicChar = '\x38';
+
 struct ipcCallback : public ipcListNode<ipcCallback>
 {
@@ -129 +135 @@
 {
   RTCRITSECT   CritSect;
+  RTPIPE       hWakeupPipeW;
   PRPollDesc   fds[2];
   ipcCallbackQ callback_queue;
@@ -155 +162 @@
 
   s->send_queue.DeleteAll();
-  delete s;
+  RTMemFree(s);
 }
 
 static ipcConnectionState *ConnCreate(PRFileDesc *fd)
 {
-  ipcConnectionState *s = new ipcConnectionState;
-  if (!s)
+    ipcConnectionState *s = (ipcConnectionState *)RTMemAllocZ(sizeof(*s));
+    if (!s)
+      return NULL;
+
+    int vrc = RTCritSectInit(&s->CritSect);
+    if (RT_SUCCESS(vrc))
+    {
+        RTPIPE hPipeR;
+
+        vrc = RTPipeCreate(&hPipeR, &s->hWakeupPipeW, 0 /*fFlags*/);
+        if (RT_SUCCESS(vrc))
+        {
+            s->fds[SOCK].fd = NULL;
+            s->fds[POLL].fd = PR_AllocFileDesc((PRInt32)RTPipeToNative(hPipeR), PR_GetPipeMethods());
+            s->send_offset = 0;
+            s->in_msg = NULL;
+            s->shutdown = PR_FALSE;
+
+            if (s->fds[POLL].fd)
+            {
+                /* NSPR has taken over the pipe. */
+                vrc = RTPipeCloseEx(hPipeR, true /*fLeaveOpen*/); AssertRC(vrc);
+
+                // disable inheritance of the IPC socket by children started
+                // using non-NSPR process API
+                PRStatus status = PR_SetFDInheritable(fd, PR_FALSE);
+                if (status == PR_SUCCESS)
+                {
+                    // store this only if we are going to succeed.
+                    s->fds[SOCK].fd = fd;
+
+                    return s;
+                }
+
+                PR_Close(s->fds[POLL].fd);
+                s->fds[POLL].fd = NULL;
+                LOG(("coudn't make IPC socket non-inheritable [err=%d]\n", PR_GetError()));
+            }
+
+            vrc = RTPipeClose(hPipeR);          AssertRC(vrc);
+            vrc = RTPipeClose(s->hWakeupPipeW); AssertRC(vrc);
+        }
+
+        ConnDestroy(s);
+    }
+
     return NULL;
-
-  int vrc = RTCritSectInit(&s->CritSect);
-  if (RT_FAILURE(vrc))
-  {
-    ConnDestroy(s);
-    return NULL;
-  }
-
-  s->fds[SOCK].fd = NULL;
-  s->fds[POLL].fd = PR_NewPollableEvent();
-  s->send_offset = 0;
-  s->in_msg = NULL;
-  s->shutdown = PR_FALSE;
-
-  if (!s->fds[1].fd)
-  {
-    ConnDestroy(s);
-    return NULL;
-  }
-
-  // disable inheritance of the IPC socket by children started
-  // using non-NSPR process API
-  PRStatus status = PR_SetFDInheritable(fd, PR_FALSE);
-  if (status != PR_SUCCESS)
-  {
-    LOG(("coudn't make IPC socket non-inheritable [err=%d]\n", PR_GetError()));
-    return NULL;
-  }
-
-  // store this only if we are going to succeed.
-  s->fds[SOCK].fd = fd;
-
-  return s;
 }
 
@@ -350 +368 @@
       if (s->fds[POLL].out_flags & PR_POLL_READ)
       {
-        PR_WaitForPollableEvent(s->fds[POLL].fd);
+        /* Drain wakeup pipe. */
+        uint8_t buf[32];
+#ifdef DEBUG
+        PRIntn i;
+#endif
+        PRInt32 nBytes = PR_Read(s->fds[POLL].fd, buf, sizeof(buf));
+        Assert(nBytes > 0);
+
+#ifdef DEBUG
+        /* Make sure this is not written with something else. */
+        for (i = 0; i < nBytes; i++) {
+            Assert(buf[i] == magicChar);
+        }
+#endif
+
         RTCritSectEnter(&s->CritSect);
 
@@ -533 +565 @@
 IPC_Disconnect()
 {
-  // Must disconnect on same thread used to connect!
-  Assert(gMainThread == RTThreadSelf());
-
-  if (!gConnState || !gConnThread)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  RTCritSectEnter(&gConnState->CritSect);
-  gConnState->shutdown = PR_TRUE;
-  PR_SetPollableEvent(gConnState->fds[POLL].fd);
-  RTCritSectLeave(&gConnState->CritSect);
-
-  int rcThread;
-  RTThreadWait(gConnThread, RT_INDEFINITE_WAIT, &rcThread);
-  AssertRC(rcThread);
-
-  ConnDestroy(gConnState);
-
-  gConnState = NULL;
-  gConnThread = NULL;
-  return NS_OK;
+    // Must disconnect on same thread used to connect!
+    Assert(gMainThread == RTThreadSelf());
+
+    if (!gConnState || !gConnThread)
+      return NS_ERROR_NOT_INITIALIZED;
+
+    RTCritSectEnter(&gConnState->CritSect);
+    gConnState->shutdown = PR_TRUE;
+    size_t cbWrittenIgn = 0;
+    int vrc = RTPipeWrite(gConnState->hWakeupPipeW, &magicChar, sizeof(magicChar), &cbWrittenIgn);
+    AssertRC(vrc);
+    RTCritSectLeave(&gConnState->CritSect);
+
+    int rcThread;
+    RTThreadWait(gConnThread, RT_INDEFINITE_WAIT, &rcThread);
+    AssertRC(rcThread);
+
+    ConnDestroy(gConnState);
+
+    gConnState = NULL;
+    gConnThread = NULL;
+    return NS_OK;
 }
 
@@ -558 +592 @@
 IPC_SendMsg(ipcMessage *msg)
 {
-  if (!gConnState || !gConnThread)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  RTCritSectEnter(&gConnState->CritSect);
-  gConnState->send_queue.Append(msg);
-  PR_SetPollableEvent(gConnState->fds[POLL].fd);
-  RTCritSectLeave(&gConnState->CritSect);
-
-  return NS_OK;
+    if (!gConnState || !gConnThread)
+      return NS_ERROR_NOT_INITIALIZED;
+
+    RTCritSectEnter(&gConnState->CritSect);
+    gConnState->send_queue.Append(msg);
+    size_t cbWrittenIgn = 0;
+    int vrc = RTPipeWrite(gConnState->hWakeupPipeW, &magicChar, sizeof(magicChar), &cbWrittenIgn);
+    AssertRC(vrc);
+    RTCritSectLeave(&gConnState->CritSect);
+
+    return NS_OK;
 }
 
@@ -572 +608 @@
 IPC_DoCallback(ipcCallbackFunc func, void *arg)
 {
-  if (!gConnState || !gConnThread)
-    return NS_ERROR_NOT_INITIALIZED;
-  
-  ipcCallback *callback = new ipcCallback;
-  if (!callback)
-    return NS_ERROR_OUT_OF_MEMORY;
-  callback->func = func;
-  callback->arg = arg;
-
-  RTCritSectEnter(&gConnState->CritSect);
-  gConnState->callback_queue.Append(callback);
-  PR_SetPollableEvent(gConnState->fds[POLL].fd);
-  RTCritSectLeave(&gConnState->CritSect);
-  return NS_OK;
-}
-
+    if (!gConnState || !gConnThread)
+      return NS_ERROR_NOT_INITIALIZED;
+    
+    ipcCallback *callback = new ipcCallback;
+    if (!callback)
+      return NS_ERROR_OUT_OF_MEMORY;
+    callback->func = func;
+    callback->arg = arg;
+
+    RTCritSectEnter(&gConnState->CritSect);
+    gConnState->callback_queue.Append(callback);
+    size_t cbWrittenIgn = 0;
+    int vrc = RTPipeWrite(gConnState->hWakeupPipeW, &magicChar, sizeof(magicChar), &cbWrittenIgn);
+    AssertRC(vrc);
+    RTCritSectLeave(&gConnState->CritSect);
+    return NS_OK;
+}
+