Changeset 101795 in vbox

Timestamp:

Nov 4, 2023 9:33:05 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove unused code because _PR_PTHREADS is always defined, bugref:10545

File:

• trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c (modified) (2 diffs)

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

@@ -59 +59 @@
 PRFileDesc *_pr_stderr;
 
-#if !defined(_PR_PTHREADS) && !defined(_PR_BTHREADS)
-
-PRCList _pr_active_local_threadQ =
-                        PR_INIT_STATIC_CLIST(&_pr_active_local_threadQ);
-PRCList _pr_active_global_threadQ =
-                        PR_INIT_STATIC_CLIST(&_pr_active_global_threadQ);
-
-_MDLock  _pr_cpuLock;           /* lock for the CPU Q */
-PRCList _pr_cpuQ = PR_INIT_STATIC_CLIST(&_pr_cpuQ);
-
-PRUint32 _pr_utid;
-
-PRInt32 _pr_userActive;
-PRInt32 _pr_systemActive;
-PRUintn _pr_maxPTDs;
-
-#ifdef _PR_LOCAL_THREADS_ONLY
-
-struct _PRCPU   *_pr_currentCPU;
-PRThread        *_pr_currentThread;
-PRThread        *_pr_lastThread;
-PRInt32         _pr_intsOff;
-
-#endif /* _PR_LOCAL_THREADS_ONLY */
-
-/* Lock protecting all "termination" condition variables of all threads */
-PRLock *_pr_terminationCVLock;
-
-#endif /* !defined(_PR_PTHREADS) */
-
 PRLock *_pr_sleeplock;  /* used in PR_Sleep(), classic and pthreads */
 
@@ -295 +265 @@
     return rv;
 }  /* PR_Initialize */
-
-/*
- *-----------------------------------------------------------------------
- *
- * _PR_CleanupBeforeExit --
- *
- *   Perform the cleanup work before exiting the process.
- *   We first do the cleanup generic to all platforms.  Then
- *   we call _PR_MD_CLEANUP_BEFORE_EXIT(), where platform-dependent
- *   cleanup is done.  This function is used by PR_Cleanup().
- *
- * See also: PR_Cleanup().
- *
- *-----------------------------------------------------------------------
- */
-#if defined(_PR_PTHREADS) || defined(_PR_BTHREADS)
-    /* see ptthread.c */
-#else
-static void
-_PR_CleanupBeforeExit(void)
-{
-/*
-Do not make any calls here other than to destroy resources.  For example,
-do not make any calls that eventually may end up in PR_Lock.  Because the
-thread is destroyed, can not access current thread any more.
-*/
-    _PR_CleanupTPD();
-    if (_pr_terminationCVLock)
-    /*
-     * In light of the comment above, this looks real suspicious.
-     * I'd go so far as to say it's just a problem waiting to happen.
-     */
-        PR_DestroyLock(_pr_terminationCVLock);
-
-    _PR_MD_CLEANUP_BEFORE_EXIT();
-}
-#endif /* defined(_PR_PTHREADS) */
-
-/*
- *----------------------------------------------------------------------
- *
- * PR_Cleanup --
- *
- *   Perform a graceful shutdown of the NSPR runtime.  PR_Cleanup() may
- *   only be called from the primordial thread, typically at the
- *   end of the main() function.  It returns when it has completed
- *   its platform-dependent duty and the process must not make any other
- *   NSPR library calls prior to exiting from main().
- *
- *   PR_Cleanup() first blocks the primordial thread until all the
- *   other user (non-system) threads, if any, have terminated.
- *   Then it performs cleanup in preparation for exiting the process.
- *   PR_Cleanup() does not exit the primordial thread (which would
- *   in turn exit the process).
- *
- *   PR_Cleanup() only responds when it is called by the primordial
- *   thread. Calls by any other thread are silently ignored.
- *
- * See also: PR_ExitProcess()
- *
- *----------------------------------------------------------------------
- */
-#if defined(_PR_PTHREADS) || defined(_PR_BTHREADS)
-    /* see ptthread.c */
-#else
-
-PR_IMPLEMENT(PRStatus) PR_Cleanup()
-{
-    PRThread *me = PR_GetCurrentThread();
-    PR_ASSERT((NULL != me) && (me->flags & _PR_PRIMORDIAL));
-    if ((NULL != me) && (me->flags & _PR_PRIMORDIAL))
-    {
-        PR_LOG(_pr_thread_lm, PR_LOG_MIN, ("PR_Cleanup: shutting down NSPR"));
-
-        /*
-         * No more recycling of threads
-         */
-        _pr_recycleThreads = 0;
-
-        /*
-         * Wait for all other user (non-system/daemon) threads
-         * to terminate.
-         */
-        PR_Lock(_pr_activeLock);
-        while (_pr_userActive > _pr_primordialExitCount) {
-            PR_WaitCondVar(_pr_primordialExitCVar, PR_INTERVAL_NO_TIMEOUT);
-        }
-        PR_Unlock(_pr_activeLock);
-
-#ifdef IRIX
-                _PR_MD_PRE_CLEANUP(me);
-                /*
-                 * The primordial thread must now be running on the primordial cpu
-                 */
-        PR_ASSERT((_PR_IS_NATIVE_THREAD(me)) || (me->cpu->id == 0));
-#endif
-
-        _PR_CleanupDtoa();
-        _PR_CleanupCallOnce();
-                _PR_ShutdownLinker();
-        /* Release the primordial thread's private data, etc. */
-        _PR_CleanupThread(me);
-
-        _PR_MD_STOP_INTERRUPTS();
-
-            PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-                    ("PR_Cleanup: clean up before destroying thread"));
-            _PR_LogCleanup();
-
-        /*
-         * This part should look like the end of _PR_NativeRunThread
-         * and _PR_UserRunThread.
-         */
-        if (_PR_IS_NATIVE_THREAD(me)) {
-            _PR_MD_EXIT_THREAD(me);
-            _PR_NativeDestroyThread(me);
-        } else {
-            _PR_UserDestroyThread(me);
-            PR_DELETE(me->stack);
-            PR_DELETE(me);
-        }
-
-        /*
-         * XXX: We are freeing the heap memory here so that Purify won't
-         * complain, but we should also free other kinds of resources
-         * that are allocated by the _PR_InitXXX() functions.
-         * Ideally, for each _PR_InitXXX(), there should be a corresponding
-         * _PR_XXXCleanup() that we can call here.
-         */
-        _PR_CleanupIO();
-#ifdef WINNT
-        _PR_CleanupCPUs();
-#endif
-        _PR_CleanupThreads();
-        PR_DestroyLock(_pr_sleeplock);
-        _pr_sleeplock = NULL;
-        _PR_CleanupLayerCache();
-        _PR_CleanupEnv();
-        _PR_CleanupStacks();
-        _PR_CleanupBeforeExit();
-        _pr_initialized = PR_FALSE;
-        return PR_SUCCESS;
-    }
-    return PR_FAILURE;
-}
-#endif /* defined(_PR_PTHREADS) */
-
-/*
- *------------------------------------------------------------------------
- * PR_ProcessExit --
- *
- *   Cause an immediate, nongraceful, forced termination of the process.
- *   It takes a PRIntn argument, which is the exit status code of the
- *   process.
- *
- * See also: PR_Cleanup()
- *
- *------------------------------------------------------------------------
- */
-
-#if defined(_PR_PTHREADS) || defined(_PR_BTHREADS)
-    /* see ptthread.c */
-#else
-PR_IMPLEMENT(void) PR_ProcessExit(PRIntn status)
-{
-    _PR_MD_EXIT(status);
-}
-
-#endif /* defined(_PR_PTHREADS) */
 
 PR_IMPLEMENT(PRProcessAttr *)