Changeset 101885 in vbox

Timestamp:

Nov 6, 2023 5:52:28 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Start converting some code to use IPRT exclusively, bugref:10545

File:

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

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

@@ -38 +38 @@
 #include "private/pprio.h"
 #include "prerror.h"
-#include "prthread.h"
-#include "prlock.h"
-#include "prlog.h" // for PR_ASSERT (we don't actually use NSPR logging)
 #include "prio.h"
 
@@ -49 +46 @@
 
 #ifdef VBOX
-# include "prenv.h"
+# include <iprt/assert.h>
+# include <iprt/critsect.h>
+# include <iprt/err.h>
+# include <iprt/env.h>
+# include <iprt/log.h>
+# include <iprt/thread.h>
+
 # include <stdio.h>
-# include <VBox/log.h>
 #endif
 
@@ -64 +66 @@
 
 
-// single user systems, like OS/2, don't need these security checks.
-#ifndef XP_OS2
-#define IPC_SKIP_SECURITY_CHECKS
-#endif
-
-#ifndef IPC_SKIP_SECURITY_CHECKS
 #include <unistd.h>
 #include <sys/stat.h>
-#endif
 
 static PRStatus
 DoSecurityCheck(PRFileDesc *fd, const char *path)
 {
-#ifndef IPC_SKIP_SECURITY_CHECKS
     //
     // now that we have a connected socket; do some security checks on the
@@ -116 +110 @@
         }
     }
-#endif
+
     return PR_SUCCESS;
 }
@@ -134 +128 @@
 struct ipcConnectionState
 {
-  PRLock      *lock;
+  RTCRITSECT   CritSect;
   PRPollDesc   fds[2];
   ipcCallbackQ callback_queue;
@@ -146 +140 @@
 #define POLL 1
 
-static void
-ConnDestroy(ipcConnectionState *s)
-{
-  if (s->lock)
-    PR_DestroyLock(s->lock);  
+static void ConnDestroy(ipcConnectionState *s)
+{
+  if (RTCritSectIsInitialized(&s->CritSect))
+    RTCritSectDelete(&s->CritSect);
 
   if (s->fds[SOCK].fd)
@@ -165 +158 @@
 }
 
-static ipcConnectionState *
-ConnCreate(PRFileDesc *fd)
+static ipcConnectionState *ConnCreate(PRFileDesc *fd)
 {
   ipcConnectionState *s = new ipcConnectionState;
@@ -172 +164 @@
     return NULL;
 
-  s->lock = PR_NewLock();
+  int vrc = RTCritSectInit(&s->CritSect);
+  if (RT_FAILURE(vrc))
+  {
+    ConnDestroy(s);
+    return NULL;
+  }
+
   s->fds[SOCK].fd = NULL;
   s->fds[POLL].fd = PR_NewPollableEvent();
@@ -179 +177 @@
   s->shutdown = PR_FALSE;
 
-  if (!s->lock || !s->fds[1].fd)
+  if (!s->fds[1].fd)
   {
     ConnDestroy(s);
@@ -251 +249 @@
         }
 
-        PR_ASSERT(PRUint32(n) >= bytesRead);
+        Assert(PRUint32(n) >= bytesRead);
         n -= bytesRead;
         pdata += bytesRead;
@@ -276 +274 @@
   nsresult rv = NS_OK;
 
-  PR_Lock(s->lock);
+  RTCritSectEnter(&s->CritSect);
 
   // write one message and then return.
@@ -312 +310 @@
   }
 
-  PR_Unlock(s->lock);
+  RTCritSectLeave(&s->CritSect);
   return rv;
 }
 
-PR_STATIC_CALLBACK(void)
-ConnThread(void *arg)
-{
+static DECLCALLBACK(int) ipcConnThread(RTTHREAD hSelf, void *pvArg)
+{
+  RT_NOREF(hSelf);
+
   PRInt32 num;
   nsresult rv = NS_OK;
 
-  ipcConnectionState *s = (ipcConnectionState *) arg;
+  ipcConnectionState *s = (ipcConnectionState *)pvArg;
 
   // we monitor two file descriptors in this thread.  the first (at index 0) is
@@ -352 +351 @@
       {
         PR_WaitForPollableEvent(s->fds[POLL].fd);
-        PR_Lock(s->lock);
+        RTCritSectEnter(&s->CritSect);
 
         if (!s->send_queue.IsEmpty())
@@ -360 +359 @@
           s->callback_queue.MoveTo(cbs_to_run);
 
-        PR_Unlock(s->lock);
+        RTCritSectLeave(&s->CritSect);
       }
 
@@ -382 +381 @@
       // request until after all queued up messages have been sent and until
       // after all queued up callbacks have been run.
-      PR_Lock(s->lock);
+      RTCritSectEnter(&s->CritSect);
       if (s->shutdown && s->send_queue.IsEmpty() && s->callback_queue.IsEmpty())
         rv = NS_ERROR_ABORT;
-      PR_Unlock(s->lock);
+      RTCritSectLeave(&s->CritSect);
     }
     else
@@ -401 +400 @@
 
   LOG(("IPC thread exiting\n"));
+  return VINF_SUCCESS;
 }
 
@@ -408 +408 @@
 
 static ipcConnectionState *gConnState = NULL;
-static PRThread *gConnThread = NULL;
+static RTTHREAD gConnThread = NULL;
 
 #ifdef DEBUG
-static PRThread *gMainThread = NULL;
+static RTTHREAD gMainThread = NULL;
 #endif
 
@@ -436 +436 @@
 
 #ifdef VBOX
-  if (PR_GetEnv("TESTBOX_UUID"))
+  if (RTEnvExist("TESTBOX_UUID"))
     fprintf(stderr, "IPC socket path: %s\n", addr.local.path);
   LogRel(("IPC socket path: %s\n", addr.local.path));
@@ -467 +467 @@
   PRFileDesc *fd = NULL;
   nsresult rv = NS_ERROR_FAILURE;
+  int vrc = VINF_SUCCESS;
 
   if (gConnState)
@@ -505 +506 @@
   fd = NULL; // connection state now owns the socket
 
-  gConnThread = PR_CreateThread(PR_USER_THREAD,
-                                ConnThread,
-                                gConnState,
-                                PR_PRIORITY_NORMAL,
-                                PR_GLOBAL_THREAD,
-                                PR_JOINABLE_THREAD,
-                                0);
-  if (!gConnThread)
+  vrc = RTThreadCreate(&gConnThread, ipcConnThread, gConnState, 0 /*cbStack*/,
+                       RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "Ipc-Conn");
+  if (RT_FAILURE(vrc))
   {
     rv = NS_ERROR_OUT_OF_MEMORY;
@@ -519 +515 @@
 
 #ifdef DEBUG
-  gMainThread = PR_GetCurrentThread();
+  gMainThread = RTThreadSelf();
 #endif
   return NS_OK;
@@ -538 +534 @@
 {
   // Must disconnect on same thread used to connect!
-  PR_ASSERT(gMainThread == PR_GetCurrentThread());
+  Assert(gMainThread == RTThreadSelf());
 
   if (!gConnState || !gConnThread)
     return NS_ERROR_NOT_INITIALIZED;
 
-  PR_Lock(gConnState->lock);
+  RTCritSectEnter(&gConnState->CritSect);
   gConnState->shutdown = PR_TRUE;
   PR_SetPollableEvent(gConnState->fds[POLL].fd);
-  PR_Unlock(gConnState->lock);
-
-  PR_JoinThread(gConnThread);
+  RTCritSectLeave(&gConnState->CritSect);
+
+  int rcThread;
+  RTThreadWait(gConnThread, RT_INDEFINITE_WAIT, &rcThread);
+  AssertRC(rcThread);
 
   ConnDestroy(gConnState);
@@ -563 +561 @@
     return NS_ERROR_NOT_INITIALIZED;
 
-  PR_Lock(gConnState->lock);
+  RTCritSectEnter(&gConnState->CritSect);
   gConnState->send_queue.Append(msg);
   PR_SetPollableEvent(gConnState->fds[POLL].fd);
-  PR_Unlock(gConnState->lock);
+  RTCritSectLeave(&gConnState->CritSect);
 
   return NS_OK;
@@ -583 +581 @@
   callback->arg = arg;
 
-  PR_Lock(gConnState->lock);
+  RTCritSectEnter(&gConnState->CritSect);
   gConnState->callback_queue.Append(callback);
   PR_SetPollableEvent(gConnState->fds[POLL].fd);
-  PR_Unlock(gConnState->lock);
+  RTCritSectLeave(&gConnState->CritSect);
   return NS_OK;
 }
 
-//-----------------------------------------------------------------------------
-
-#ifdef TEST_STANDALONE
-
-void IPC_OnConnectionFault(nsresult rv)
-{
-  LOG(("IPC_OnConnectionFault [rv=%x]\n", rv));
-}
-
-void IPC_OnMessageAvailable(ipcMessage *msg)
-{
-  LOG(("IPC_OnMessageAvailable\n"));
-  delete msg;
-}
-
-int main()
-{
-  IPC_InitLog(">>>");
-  IPC_Connect("/builds/moz-trunk/seamonkey-debug-build/dist/bin/mozilla-ipcd");
-  IPC_Disconnect();
-  return 0;
-}
-
-#endif