Changeset 101964 in vbox for trunk/src/libs/xpcom18a4/nsprpub

Timestamp:

Nov 8, 2023 12:18:16 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Get rid of the file descriptor cache in nsprpub as it isn't of any real use now, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/primpl.h (modified) (1 diff)
• src/io/prfdcach.c (deleted)
• src/pthreads/ptio.c (modified) (3 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -222 +222 @@
 #define _PR_MD_GETOPENFILEINFO64 _MD_GETOPENFILEINFO64
 
-
-/*****************************************************************************/
-/************************** File descriptor caching **************************/
-/*****************************************************************************/
-extern void _PR_InitFdCache(void);
-extern void _PR_CleanupFdCache(void);
-extern PRFileDesc *_PR_Getfd(void);
-extern void _PR_Putfd(PRFileDesc *fd);
 
 /*

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

@@ -270 +270 @@
 
 #endif  /* DEBUG */
+
+/*
+** Allocate a file descriptor from the heap.
+*/
+static PRFileDesc *_PR_Getfd(void)
+{
+    PRFileDesc *fd = PR_NEW(PRFileDesc);
+    if (NULL != fd)
+    {
+        fd->secret = PR_NEW(PRFilePrivate);
+        if (NULL == fd->secret) PR_DELETE(fd);
+    }
+    if (fd == NULL)
+        return NULL;
+
+    fd->dtor = NULL;
+    fd->lower = fd->higher = NULL;
+    fd->identity = PR_NSPR_IO_LAYER;
+    memset(fd->secret, 0, sizeof(PRFilePrivate));
+    return fd;
+}  /* _PR_Getfd */
+
+static void _PR_Putfd(PRFileDesc *fd)
+{
+    PR_Free(fd->secret);
+    PR_Free(fd);
+}  /* _PR_Putfd */
 
 static void pt_poll_now(pt_Continuation *op)
@@ -622 +649 @@
     PR_ASSERT(NULL != _pr_rename_lock);
 
-    _PR_InitFdCache();  /* do that */
-
     _pr_stdin = pt_SetMethods(0, PR_DESC_FILE, PR_FALSE, PR_TRUE);
     _pr_stdout = pt_SetMethods(1, PR_DESC_FILE, PR_FALSE, PR_TRUE);
@@ -659 +684 @@
     _PR_Putfd(_pr_stderr);
     _pr_stderr = NULL;
-
-    _PR_CleanupFdCache();
 
     if (_pr_rename_lock)