Changeset 101772 in vbox

Timestamp:

Nov 4, 2023 5:54:52 PM (17 months ago)

Author:

vboxsync

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

159868

Message:

libs/xpcom: Remove prmalloc.c as _PR_OVERRIDE_MALLOC is never set in our case, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/private/primpl.h (modified) (1 diff)
• nsprpub/pr/src/malloc/prmalloc.c (deleted)
• nsprpub/pr/src/malloc/prmem.c (modified) (1 diff)
• nsprpub/pr/src/misc/prinit.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -528 +528 @@
         nsprpub/pr/src/io/prstdio.c \
         nsprpub/pr/src/linking/prlink.c \
-        nsprpub/pr/src/malloc/prmalloc.c \
         nsprpub/pr/src/malloc/prmem.c \
         nsprpub/pr/src/md/prosdep.c \

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

@@ -1861 +1861 @@
 #endif
 
-/* Overriding malloc, free, etc. */
-#if !defined(_PR_NO_PREEMPT) && defined(XP_UNIX) \
-        && !defined(_PR_PTHREADS) && !defined(_PR_GLOBAL_THREADS_ONLY) \
-        && !defined(PURIFY) \
-        && !defined(DARWIN) \
-        && !defined(NEXTSTEP) \
-        && !defined(QNX) \
-        && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
-#define _PR_OVERRIDE_MALLOC
-#endif
 
 /*************************************************************************

trunk/src/libs/xpcom18a4/nsprpub/pr/src/malloc/prmem.c

@@ -576 +576 @@
 #endif /* _PR_ZONE_ALLOCATOR */
 
-/*
-** Complexity alert!
-**
-** If malloc/calloc/free (etc.) were implemented to use pr lock's then
-** the entry points could block when called if some other thread had the
-** lock.
-**
-** Most of the time this isn't a problem. However, in the case that we
-** are using the thread safe malloc code after PR_Init but before
-** PR_AttachThread has been called (on a native thread that nspr has yet
-** to be told about) we could get royally screwed if the lock was busy
-** and we tried to context switch the thread away. In this scenario
-**      PR_CURRENT_THREAD() == NULL
-**
-** To avoid this unfortunate case, we use the low level locking
-** facilities for malloc protection instead of the slightly higher level
-** locking. This makes malloc somewhat faster so maybe it's a good thing
-** anyway.
-*/
-#ifdef _PR_OVERRIDE_MALLOC
-
-/* Imports */
-extern void *_PR_UnlockedMalloc(size_t size);
-extern void *_PR_UnlockedMemalign(size_t alignment, size_t size);
-extern void _PR_UnlockedFree(void *ptr);
-extern void *_PR_UnlockedRealloc(void *ptr, size_t size);
-extern void *_PR_UnlockedCalloc(size_t n, size_t elsize);
-
-static PRBool _PR_malloc_initialised = PR_FALSE;
-
-#ifdef _PR_PTHREADS
-static pthread_mutex_t _PR_MD_malloc_crustylock;
-
-#define _PR_Lock_Malloc() {                                             \
-                                if(PR_TRUE == _PR_malloc_initialised) { \
-                                        PRStatus rv;                    \
-                                        rv = pthread_mutex_lock(&_PR_MD_malloc_crustylock); \
-                                        PR_ASSERT(0 == rv);             \
-                                }
-
-#define _PR_Unlock_Malloc()     if(PR_TRUE == _PR_malloc_initialised) { \
-                                        PRStatus rv;                    \
-                                        rv = pthread_mutex_unlock(&_PR_MD_malloc_crustylock); \
-                                        PR_ASSERT(0 == rv);             \
-                                }                                       \
-                          }
-#else /* _PR_PTHREADS */
-static _MDLock _PR_MD_malloc_crustylock;
-
-#ifdef IRIX
-#define _PR_Lock_Malloc() {                                             \
-                           PRIntn _is;                                  \
-                                if(PR_TRUE == _PR_malloc_initialised) { \
-                                if (_PR_MD_GET_ATTACHED_THREAD() &&             \
-                                        !_PR_IS_NATIVE_THREAD(          \
-                                        _PR_MD_GET_ATTACHED_THREAD()))  \
-                                                _PR_INTSOFF(_is);       \
-                                        _PR_MD_LOCK(&_PR_MD_malloc_crustylock); \
-                                }
-
-#define _PR_Unlock_Malloc()     if(PR_TRUE == _PR_malloc_initialised) { \
-                                        _PR_MD_UNLOCK(&_PR_MD_malloc_crustylock); \
-                                if (_PR_MD_GET_ATTACHED_THREAD() &&             \
-                                        !_PR_IS_NATIVE_THREAD(          \
-                                        _PR_MD_GET_ATTACHED_THREAD()))  \
-                                                _PR_INTSON(_is);        \
-                                }                                       \
-                          }
-#else   /* IRIX */
-#define _PR_Lock_Malloc() {                                             \
-                           PRIntn _is;                                  \
-                                if(PR_TRUE == _PR_malloc_initialised) { \
-                                if (_PR_MD_CURRENT_THREAD() &&          \
-                                        !_PR_IS_NATIVE_THREAD(          \
-                                        _PR_MD_CURRENT_THREAD()))       \
-                                                _PR_INTSOFF(_is);       \
-                                        _PR_MD_LOCK(&_PR_MD_malloc_crustylock); \
-                                }
-
-#define _PR_Unlock_Malloc()     if(PR_TRUE == _PR_malloc_initialised) { \
-                                        _PR_MD_UNLOCK(&_PR_MD_malloc_crustylock); \
-                                if (_PR_MD_CURRENT_THREAD() &&          \
-                                        !_PR_IS_NATIVE_THREAD(          \
-                                        _PR_MD_CURRENT_THREAD()))       \
-                                                _PR_INTSON(_is);        \
-                                }                                       \
-                          }
-#endif  /* IRIX */
-#endif /* _PR_PTHREADS */
-
-PR_IMPLEMENT(PRStatus) _PR_MallocInit(void)
-{
-    PRStatus rv = PR_SUCCESS;
-
-    if( PR_TRUE == _PR_malloc_initialised ) return PR_SUCCESS;
-
-#ifdef _PR_PTHREADS
-    {
-        int status;
-        pthread_mutexattr_t mattr;
-
-        status = _PT_PTHREAD_MUTEXATTR_INIT(&mattr);
-        PR_ASSERT(0 == status);
-        status = _PT_PTHREAD_MUTEX_INIT(_PR_MD_malloc_crustylock, mattr);
-        PR_ASSERT(0 == status);
-        status = _PT_PTHREAD_MUTEXATTR_DESTROY(&mattr);
-        PR_ASSERT(0 == status);
-    }
-#else /* _PR_PTHREADS */
-    _MD_NEW_LOCK(&_PR_MD_malloc_crustylock);
-#endif /* _PR_PTHREADS */
-
-    if( PR_SUCCESS == rv )
-    {
-        _PR_malloc_initialised = PR_TRUE;
-    }
-
-    return rv;
-}
-
-void *malloc(size_t size)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedMalloc(size);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-#if defined(IRIX)
-void *memalign(size_t alignment, size_t size)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedMemalign(alignment, size);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-void *valloc(size_t size)
-{
-    return(memalign(sysconf(_SC_PAGESIZE),size));
-}
-#endif  /* IRIX */
-
-void free(void *ptr)
-{
-    _PR_Lock_Malloc();
-    _PR_UnlockedFree(ptr);
-    _PR_Unlock_Malloc();
-}
-
-void *realloc(void *ptr, size_t size)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedRealloc(ptr, size);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-void *calloc(size_t n, size_t elsize)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedCalloc(n, elsize);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-void cfree(void *p)
-{
-    _PR_Lock_Malloc();
-    _PR_UnlockedFree(p);
-    _PR_Unlock_Malloc();
-}
-
-void _PR_InitMem(void)
-{
-    PRStatus rv;
-    rv = _PR_MallocInit();
-    PR_ASSERT(PR_SUCCESS == rv);
-}
-
-#endif /* _PR_OVERRIDE_MALLOC */

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

@@ -231 +231 @@
 #ifndef _PR_GLOBAL_THREADS_ONLY
         _PR_InitCPUs();
-#endif
-
-/*
- * XXX: call _PR_InitMem only on those platforms for which nspr implements
- *      malloc, for now.
- */
-#ifdef _PR_OVERRIDE_MALLOC
-    _PR_InitMem();
 #endif