Changeset 102470 in vbox for trunk/src/libs/xpcom18a4/nsprpub/pr

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160613

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/nsprpub/pr

Files:

• include/nspr.h (modified) (1 diff)
• include/prbit.h (modified) (2 diffs)
• include/prinrval.h (deleted)
• include/prmon.h (modified) (2 diffs)
• src/misc (deleted)
• src/pthreads/ptsynch.c (modified) (5 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/nspr.h

@@ -44 +44 @@
 
 #include "prbit.h"
-#include "prinrval.h"
 #include "prlong.h"
 #include "prmem.h"

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prbit.h

@@ -46 +46 @@
 
 /*
-** A prbitmap_t is a long integer that can be used for bitmaps
-*/
-typedef unsigned long prbitmap_t;
-
-#define PR_TEST_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] & (1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-#define PR_SET_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] |= (1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-#define PR_CLEAR_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] &= ~(1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-
-/*
 ** Compute the log of the least power of 2 greater than or equal to n
 */
@@ -100 +88 @@
 }
 
-/*
-** Macro version of PR_CeilingLog2: Compute the log of the least power of
-** 2 greater than or equal to _n. The result is returned in _log2.
-*/
-#define PR_CEILING_LOG2(_log2,_n)   \
-  PR_BEGIN_MACRO                    \
-    PRUint32 j_ = (PRUint32)(_n);       \
-    (_log2) = 0;                    \
-    if ((j_) & ((j_)-1))            \
-        (_log2) += 1;               \
-    if ((j_) >> 16)                 \
-        (_log2) += 16, (j_) >>= 16; \
-    if ((j_) >> 8)                  \
-        (_log2) += 8, (j_) >>= 8;   \
-    if ((j_) >> 4)                  \
-        (_log2) += 4, (j_) >>= 4;   \
-    if ((j_) >> 2)                  \
-        (_log2) += 2, (j_) >>= 2;   \
-    if ((j_) >> 1)                  \
-        (_log2) += 1;               \
-  PR_END_MACRO
+PR_END_EXTERN_C
 
-/*
-** Macro version of PR_FloorLog2: Compute the log of the greatest power of
-** 2 less than or equal to _n. The result is returned in _log2.
-**
-** This is equivalent to finding the highest set bit in the word.
-*/
-#define PR_FLOOR_LOG2(_log2,_n)   \
-  PR_BEGIN_MACRO                    \
-    PRUint32 j_ = (PRUint32)(_n);       \
-    (_log2) = 0;                    \
-    if ((j_) >> 16)                 \
-        (_log2) += 16, (j_) >>= 16; \
-    if ((j_) >> 8)                  \
-        (_log2) += 8, (j_) >>= 8;   \
-    if ((j_) >> 4)                  \
-        (_log2) += 4, (j_) >>= 4;   \
-    if ((j_) >> 2)                  \
-        (_log2) += 2, (j_) >>= 2;   \
-    if ((j_) >> 1)                  \
-        (_log2) += 1;               \
-  PR_END_MACRO
-
-PR_END_EXTERN_C
 #endif /* prbit_h___ */

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prmon.h

@@ -40 +40 @@
 
 #include "prtypes.h"
-#include "prinrval.h"
+
+#include <iprt/types.h>
 
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
@@ -105 +106 @@
 ** Returns PR_FAILURE if the caller has not entered the monitor.
 */
-NSPR_API(PRStatus) PR_Wait(PRMonitor *mon, PRIntervalTime ticks);
+NSPR_API(PRStatus) PR_Wait(PRMonitor *mon, RTMSINTERVAL msWait);
 
 /*

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c

@@ -285 +285 @@
 
 static PRIntn pt_TimedWait(
-    pthread_cond_t *cv, pthread_mutex_t *ml, PRIntervalTime timeout)
+    pthread_cond_t *cv, pthread_mutex_t *ml, RTMSINTERVAL msTimeout)
 {
     int rv;
     struct timeval now;
     struct timespec tmo;
-    PRUint32 ticks = PR_TicksPerSecond();
-
-    tmo.tv_sec = (PRInt32)(timeout / ticks);
-    tmo.tv_nsec = (PRInt32)(timeout - (tmo.tv_sec * ticks));
-    tmo.tv_nsec = (PRInt32)PR_IntervalToMicroseconds(PT_NANOPERMICRO * tmo.tv_nsec);
+
+    tmo.tv_sec = (PRInt32)(msTimeout / RT_MS_1SEC);
+    tmo.tv_nsec = (PRInt32)((msTimeout - (tmo.tv_sec * RT_MS_1SEC)) * RT_NS_1MS);
 
     /* pthreads wants this in absolute time, off we go ... */
@@ -367 +365 @@
 }  /* PR_DestroyCondVar */
 
-PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PRCondVar *cvar, PRIntervalTime timeout)
+PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PRCondVar *cvar, RTMSINTERVAL msTimeout)
 {
     PRIntn rv;
@@ -394 +392 @@
     cvar->lock->locked = PR_FALSE;
 
-    if (timeout == PR_INTERVAL_NO_TIMEOUT)
+    if (msTimeout == RT_INDEFINITE_WAIT)
         rv = pthread_cond_wait(&cvar->cv, &cvar->lock->mutex);
     else
-        rv = pt_TimedWait(&cvar->cv, &cvar->lock->mutex, timeout);
+        rv = pt_TimedWait(&cvar->cv, &cvar->lock->mutex, msTimeout);
 
     /* We just got the lock back - this better be empty */
@@ -545 +543 @@
 }  /* PR_ExitMonitor */
 
-PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor *mon, PRIntervalTime timeout)
+PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor *mon, RTMSINTERVAL msTimeout)
 {
     PRStatus rv;
@@ -565 +563 @@
     _PT_PTHREAD_INVALIDATE_THR_HANDLE(mon->owner);
     
-    rv = PR_WaitCondVar(mon->cvar, timeout);
+    rv = PR_WaitCondVar(mon->cvar, msTimeout);
 
     /* reinstate the intresting information */