Changeset 102470 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

Dec 5, 2023 11:03:48 AM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert the PR_Wait() function to take the timeout in milliseconds and get rid of PR_Interval* and use RTTime*, bugref:10545 [2nd attempt]

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• client/public/ipcdclient.h (modified) (2 diffs)
• client/src/ipcService.cpp (modified) (1 diff)
• client/src/ipcdclient.cpp (modified) (6 diffs)
• extensions/dconnect/src/ipcDConnectService.cpp (modified) (5 diffs)
• extensions/lock/src/ipcLockService.cpp (modified) (1 diff)
• extensions/transmngr/src/tmTransactionService.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/public/ipcdclient.h

@@ -54 +54 @@
 #include "ipcIClientObserver.h"
 
-#include "prinrval.h"
+#include <iprt/types.h>
 
 /* This API is only provided for the extensions compiled into the IPCDC
@@ -240 +240 @@
   ipcIMessageObserver *aObserver = nsnull,
   ipcIMessageObserver *aConsumer = nsnull,
-  PRIntervalTime       aTimeout = PR_INTERVAL_NO_TIMEOUT
+  RTMSINTERVAL        aTimeout = RT_INDEFINITE_WAIT
 );
 

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

@@ -105 +105 @@
 {
     return IPC_WaitMessage(aSenderID, aTarget, aObserver, nsnull,
-                           PR_MillisecondsToInterval(aTimeout));
+                           aTimeout);
 }
 

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

@@ -66 +66 @@
 /* ------------------------------------------------------------------------- */
 
-#define IPC_REQUEST_TIMEOUT PR_SecondsToInterval(30)
+#define IPC_REQUEST_TIMEOUT (30 * RT_MS_1SEC)
 
 /* ------------------------------------------------------------------------- */
@@ -307 +307 @@
 static nsresult
 WaitTarget(const nsID           &aTarget,
-           PRIntervalTime        aTimeout,
+           RTMSINTERVAL         aTimeout,
            ipcMessage          **aMsg,
            ipcMessageSelector    aSelector = nsnull,
@@ -323 +323 @@
   PRBool isIPCMTarget = aTarget.Equals(IPCM_TARGET);
 
-  PRIntervalTime timeStart = PR_IntervalNow();
-  PRIntervalTime timeEnd;
-  if (aTimeout == PR_INTERVAL_NO_TIMEOUT)
-    timeEnd = aTimeout;
-  else if (aTimeout == PR_INTERVAL_NO_WAIT)
+  uint64_t timeStart = RTTimeProgramMilliTS();
+  uint64_t timeEnd;
+  if (aTimeout == RT_INDEFINITE_WAIT)
+    timeEnd = UINT64_MAX;
+  else if (aTimeout == 0)
     timeEnd = timeStart;
   else
@@ -335 +335 @@
     // if overflowed, then set to max value
     if (timeEnd < timeStart)
-      timeEnd = PR_INTERVAL_NO_TIMEOUT;
+      timeEnd = UINT64_MAX;
   }
 
@@ -440 +440 @@
 #endif /* VBOX */
 
-    PRIntervalTime t = PR_IntervalNow();
-    if (t > timeEnd) // check if timeout has expired
+    uint64_t t = RTTimeProgramMilliTS();
+    if (   aTimeout != RT_INDEFINITE_WAIT
+        && t > timeEnd) // check if timeout has expired
     {
       rv = IPC_ERROR_WOULD_BLOCK;
       break;
     }
-    mon.Wait(timeEnd - t);
+    mon.Wait(  aTimeout == RT_INDEFINITE_WAIT
+             ? RT_INDEFINITE_WAIT
+             : timeEnd - t);
 
     Log(("woke up from sleep [pendingQempty=%d connected=%d shutdown=%d isIPCMTarget=%d]\n",
@@ -1081 +1084 @@
                 ipcIMessageObserver *aObserver,
                 ipcIMessageObserver *aConsumer,
-                PRIntervalTime       aTimeout)
+                RTMSINTERVAL        aTimeout)
 {
   NS_ENSURE_TRUE(gClientState, NS_ERROR_NOT_INITIALIZED);

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -96 +96 @@
 //-----------------------------------------------------------------------------
 
-#define DCON_WAIT_TIMEOUT PR_INTERVAL_NO_TIMEOUT
+#define DCON_WAIT_TIMEOUT RT_INDEFINITE_WAIT
 
 //-----------------------------------------------------------------------------
@@ -1281 +1281 @@
     {
         uClient = aClient;
-        uTimestamp = PR_IntervalNow();
+        uTimestamp = RTTimeMilliTS();
     }
 
     PRUint32 uClient;
-    PRIntervalTime uTimestamp;
+    uint64_t uTimestamp;
 } ClientDownInfo;
 typedef std::map<PRUint32, ClientDownInfo *> ClientDownMap;
@@ -1326 +1326 @@
         // Insert new client down information. Start by expiring outdated
         // entries and free one element if there's still no space (if needed).
-        PRIntervalTime now = PR_IntervalNow();
+        uint64_t now = RTTimeMilliTS();
         while (!g_ClientDownList.empty())
         {
@@ -1332 +1332 @@
             PRInt64 diff = (PRInt64)now - cInfo->uTimestamp;
             if (diff < 0)
-                diff += (PRInt64)((PRIntervalTime)-1) + 1;
-            if (diff > PR_SecondsToInterval(15 * 60))
+                diff += (PRInt64)((uint64_t)-1) + 1;
+            if (diff > 15 * 60 * RT_MS_1SEC)
             {
                 g_ClientDownMap.erase(cInfo->uClient);
@@ -3557 +3557 @@
     mon.Exit();
     {
-      PRUint32 ticks = PR_MillisecondsToInterval(PR_MIN(mWorkers.Count() / 20 + 1, 10));
       nsAutoMonitor workersMon(mWaitingWorkersMon);
-      workersMon.Wait(ticks);
+      workersMon.Wait(PR_MIN(mWorkers.Count() / 20 + 1, 10));
     }
     mon.Enter();

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/lock/src/ipcLockService.cpp

@@ -109 +109 @@
         do {
             // block the calling thread until we get a response from the daemon
-            rv = IPC_WaitMessage(0, kLockTargetID, this, nsnull, PR_INTERVAL_NO_TIMEOUT);
+            rv = IPC_WaitMessage(0, kLockTargetID, this, nsnull, RT_INDEFINITE_WAIT);
         }
         while (NS_SUCCEEDED(rv) && !pendingLock.complete);

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp

@@ -327 +327 @@
                   aTrans->GetRawMessageLength());
   if (aSync)
-    IPC_WaitMessage(0, kTransModuleID, nsnull, nsnull, PR_INTERVAL_NO_TIMEOUT);
+    IPC_WaitMessage(0, kTransModuleID, nsnull, nsnull, RT_INDEFINITE_WAIT);
 }