Changeset 101901 in vbox

Timestamp:

Nov 6, 2023 8:28:48 PM (17 months ago)

Author:

vboxsync

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

159997

Message:

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

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/pprthred.h (modified) (2 diffs)
• include/private/primpl.h (modified) (2 diffs)
• src/pthreads/ptthread.c (modified) (6 diffs)

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

@@ -53 +53 @@
 
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-#define PR_DetachThread VBoxNsprPR_DetachThread
-#define PR_GetThreadID VBoxNsprPR_GetThreadID
-#define PR_SetThreadDumpProc VBoxNsprPR_SetThreadDumpProc
-#define PR_GetThreadAffinityMask VBoxNsprPR_GetThreadAffinityMask
-#define PR_SetThreadAffinityMask VBoxNsprPR_SetThreadAffinityMask
-#define PR_SetCPUAffinityMask VBoxNsprPR_SetCPUAffinityMask
-#define PR_ShowStatus VBoxNsprPR_ShowStatus
-#define PR_ThreadScanStackPointers VBoxNsprPR_ThreadScanStackPointers
-#define PR_ScanStackPointers VBoxNsprPR_ScanStackPointers
-#define PR_GetStackSpaceLeft VBoxNsprPR_GetStackSpaceLeft
 #define PR_NewNamedMonitor VBoxNsprPR_NewNamedMonitor
 #define PR_TestAndLock VBoxNsprPR_TestAndLock
@@ -70 +60 @@
 
 PR_BEGIN_EXTERN_C
-
-/*---------------------------------------------------------------------------
-** THREAD PRIVATE FUNCTIONS
----------------------------------------------------------------------------*/
-
-/*
-** Get the id of the named thread. Each thread is assigned a unique id
-** when it is created or attached.
-*/
-NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
-
-/*
-** Set the procedure that is called when a thread is dumped. The procedure
-** will be applied to the argument, arg, when called. Setting the procedure
-** to NULL effectively removes it.
-*/
-typedef void (*PRThreadDumpProc)(PRFileDesc *fd, PRThread *t, void *arg);
-NSPR_API(void) PR_SetThreadDumpProc(
-    PRThread* thread, PRThreadDumpProc dump, void *arg);
-
-/*
-** Get this thread's affinity mask.  The affinity mask is a 32 bit quantity
-** marking a bit for each processor this process is allowed to run on.
-** The processor mask is returned in the mask argument.
-** The least-significant-bit represents processor 0.
-**
-** Returns 0 on success, -1 on failure.
-*/
-NSPR_API(PRInt32) PR_GetThreadAffinityMask(PRThread *thread, PRUint32 *mask);
-
-/*
-** Set this thread's affinity mask.  
-**
-** Returns 0 on success, -1 on failure.
-*/
-NSPR_API(PRInt32) PR_SetThreadAffinityMask(PRThread *thread, PRUint32 mask );
-
-/*
-** Set the default CPU Affinity mask.
-**
-*/
-NSPR_API(PRInt32) PR_SetCPUAffinityMask(PRUint32 mask);
-
 
 /*---------------------------------------------------------------------------

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

@@ -394 +394 @@
 /************************************************************************/
 
-/* XXX this needs to be exported (sigh) */
-struct PRThreadStack {
-    PRCList links;
-    PRUintn flags;
-
-    char *allocBase;            /* base of stack's allocated memory */
-    PRUint32 allocSize;         /* size of stack's allocated memory */
-    char *stackBottom;          /* bottom of stack from C's point of view */
-    char *stackTop;             /* top of stack from C's point of view */
-    PRUint32 stackSize;         /* size of usable portion of the stack */
-
-    PRSegment *seg;
-        PRThread* thr;          /* back pointer to thread owning this stack */
-};
-
 extern void _PR_DestroyThreadPrivate(PRThread*);
 
@@ -420 +405 @@
     _PRStartFn startFunc;           /* the root of the client's thread */
 
-    PRThreadStack *stack;           /* info about thread's stack (for GC) */
     void *environment;              /* pointer to execution environment */
-
-    PRThreadDumpProc dump;          /* dump thread info out */
-    void *dumpArg;                  /* argument for the dump function */
 
     /*

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

@@ -88 +88 @@
 #endif
 
-/*
-** Initialize a stack for a native pthread thread
-*/
-static void _PR_InitializeStack(PRThreadStack *ts)
-{
-    if( ts && (ts->stackTop == 0) ) {
-        ts->allocBase = (char *) &ts;
-        ts->allocSize = ts->stackSize;
-
-        /*
-        ** Setup stackTop and stackBottom values.
-        */
-#ifdef HAVE_STACK_GROWING_UP
-        ts->stackBottom = ts->allocBase + ts->stackSize;
-        ts->stackTop = ts->allocBase;
-#else
-        ts->stackTop    = ts->allocBase;
-        ts->stackBottom = ts->allocBase - ts->stackSize;
-#endif
-    }
-}
-
 static void *_pt_root(void *arg)
 {
@@ -126 +104 @@
      */
     thred->id = pthread_self();
-
-    /* Set up the thread stack information */
-    _PR_InitializeStack(thred->stack);
 
     /*
@@ -303 +278 @@
 
         thred->suspend =(isGCAble) ? PT_THREAD_SETGCABLE : 0;
-
-        thred->stack = PR_NEWZAP(PRThreadStack);
-        if (thred->stack == NULL) {
-            PRIntn oserr = errno;
-            PR_Free(thred);  /* all that work ... poof! */
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, oserr);
-            thred = NULL;  /* and for what? */
-            goto done;
-        }
-        thred->stack->stackSize = stackSize;
-        thred->stack->thr = thred;
 
 #ifdef PT_NO_SIGTIMEDWAIT
@@ -349 +313 @@
             PR_Unlock(pt_book.ml);
 
-            PR_Free(thred->stack);
             PR_Free(thred);  /* all that work ... poof! */
             PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, oserr);
@@ -595 +558 @@
     if (NULL != thred->errorString)
         PR_Free(thred->errorString);
-    PR_Free(thred->stack);
     if (NULL != thred->syspoll_list)
         PR_Free(thred->syspoll_list);
@@ -660 +622 @@
     thred->next = thred->prev = NULL;
     pt_book.first = pt_book.last = thred;
-
-    thred->stack = PR_NEWZAP(PRThreadStack);
-    PR_ASSERT(thred->stack != NULL);
-    thred->stack->stackSize = 0;
-    thred->stack->thr = thred;
-        _PR_InitializeStack(thred->stack);
 
     /*