Changeset 101891 in vbox

Timestamp:

Nov 6, 2023 6:40:51 PM (16 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove more unused code in nsprpub, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/prio.h (modified) (1 diff)
• nsprpub/pr/src/io/prlayer.c (deleted)
• nsprpub/pr/src/misc/prinit.c (modified) (1 diff)
• nsprpub/pr/src/pthreads/ptio.c (modified) (1 diff)
• nsprpub/pr/src/pthreads/ptthread.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -484 +484 @@
         nsprpub/pr/src/io/priometh.c \
         nsprpub/pr/src/io/prmapopt.c \
-        nsprpub/pr/src/io/prlayer.c \
         nsprpub/pr/src/io/prlog.c \
         nsprpub/pr/src/io/prprf.c \

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

@@ -1622 +1622 @@
     PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout);
 
-/*
-**************************************************************************
-**
-** Pollable events
-**
-** A pollable event is a special kind of file descriptor.
-** The only I/O operation you can perform on a pollable event
-** is to poll it with the PR_POLL_READ flag.  You can't
-** read from or write to a pollable event.
-**
-** The purpose of a pollable event is to combine event waiting
-** with I/O waiting in a single PR_Poll call.  Pollable events
-** are implemented using a pipe or a pair of TCP sockets
-** connected via the loopback address, therefore setting and
-** waiting for pollable events are expensive operating system
-** calls.  Do not use pollable events for general thread
-** synchronization. Use condition variables instead.
-**
-** A pollable event has two states: set and unset.  Events
-** are not queued, so there is no notion of an event count.
-** A pollable event is either set or unset.
-**
-** A new pollable event is created by a PR_NewPollableEvent
-** call and is initially in the unset state.
-**
-** PR_WaitForPollableEvent blocks the calling thread until
-** the pollable event is set, and then it atomically unsets
-** the pollable event before it returns.
-**
-** To set a pollable event, call PR_SetPollableEvent.
-**
-** One can call PR_Poll with the PR_POLL_READ flag on a pollable
-** event.  When the pollable event is set, PR_Poll returns with
-** the PR_POLL_READ flag set in the out_flags.
-**
-** To close a pollable event, call PR_DestroyPollableEvent
-** (not PR_Close).
-**
-**************************************************************************
-*/
-
-NSPR_API(PRFileDesc *) PR_NewPollableEvent(void);
-
-NSPR_API(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event);
-
-NSPR_API(PRStatus) PR_SetPollableEvent(PRFileDesc *event);
-
-NSPR_API(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event);
-
 PR_END_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c

@@ -154 +154 @@
         _PR_InitTPD();
     _PR_InitEnv();
-    _PR_InitLayerCache();
     _PR_InitClock();
 

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

@@ -2672 +2672 @@
 }  /* PR_DestroySocketPollFd */
 
+#ifdef VBOX
+PR_IMPLEMENT(PRFileDesc*) PR_GetIdentitiesLayer(PRFileDesc* fd, PRDescIdentity id)
+{
+    PRFileDesc *layer = fd;
+
+    if (PR_TOP_IO_LAYER == id) {
+        if (PR_IO_LAYER_HEAD == fd->identity)
+                        return fd->lower;
+                else 
+                        return fd;
+        }
+
+    for (layer = fd; layer != NULL; layer = layer->lower)
+    {
+        if (id == layer->identity) return layer;
+    }
+    for (layer = fd; layer != NULL; layer = layer->higher)
+    {
+        if (id == layer->identity) return layer;
+    }
+    return NULL;
+}  /* PR_GetIdentitiesLayer */
+#endif
+
 PR_IMPLEMENT(PRInt32) PR_FileDesc2NativeHandle(PRFileDesc *bottom)
 {

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

@@ -977 +977 @@
         PR_DestroyLock(_pr_sleeplock);
         _pr_sleeplock = NULL;
-        _PR_CleanupLayerCache();
         _PR_CleanupEnv();
         _pr_initialized = PR_FALSE;