Changeset 101852 in vbox

Timestamp:

Nov 6, 2023 11:09:45 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Get rid of nsMemoryImpl.{cpp,h} and nsIMemory and repalce it with direct calls to RTMem* APIs, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• xpcom/base/nsIMemory.idl (deleted)
• xpcom/base/nsMemoryImpl.cpp (deleted)
• xpcom/base/nsMemoryImpl.h (deleted)
• xpcom/build/nsXPCOM.h (modified) (1 diff)
• xpcom/build/nsXPComInit.cpp (modified) (7 diffs)
• xpcom/glue/nsMemory.cpp (modified) (5 diffs)
• xpcom/glue/nsMemory.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Config.kmk

@@ -373 +373 @@
         xpcom/base/nsIDebug.idl \
         xpcom/base/nsIInterfaceRequestor.idl \
-        xpcom/base/nsIMemory.idl \
         xpcom/base/nsIProgrammingLanguage.idl \
         xpcom/base/nsISupports.idl \

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -580 +580 @@
         xpcom/base/nsExceptionService.cpp \
         xpcom/base/nsID.cpp \
-        xpcom/base/nsMemoryImpl.cpp \
         xpcom/base/nsTraceRefcntImpl.cpp
 $(evalcall VBOX_XPCOM_X86,VBox-xpcom-base)
@@ -1126 +1125 @@
                 nsIDebug.xpt \
                 nsIInterfaceRequestor.xpt \
-                nsIMemory.xpt \
                 nsIProgrammingLanguage.xpt \
                 nsISupports.xpt \

trunk/src/libs/xpcom18a4/xpcom/build/nsXPCOM.h

@@ -171 +171 @@
 
 /**
- * Public Method to access to the memory manager.  See nsIMemory
- * 
- * @status FROZEN
- * @param result Interface pointer to the memory manager 
- *
- * @return NS_OK for success;
- *         other error codes indicate a failure during initialisation.
- *
- */
-extern "C" NS_COM nsresult
-NS_GetMemoryManager(nsIMemory* *result);
-
-/**
  * Public Method to create an instance of a nsILocalFile.  This function
  * may be called prior to NS_InitXPCOM2.  

trunk/src/libs/xpcom18a4/xpcom/build/nsXPComInit.cpp

@@ -48 +48 @@
 #include "nsBinaryStream.h"
 
-#include "nsMemoryImpl.h"
 #include "nsDebugImpl.h"
 #include "nsTraceRefcntImpl.h"
@@ -124 +123 @@
 
 static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-static NS_DEFINE_CID(kMemoryCID, NS_MEMORY_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 
@@ -326 +324 @@
 
 static const nsModuleComponentInfo components[] = {
-    COMPONENT(MEMORY, nsMemoryImpl::Create),
     COMPONENT(DEBUG,  nsDebugImpl::Create),
 #define NS_ERRORSERVICE_CLASSNAME NS_ERRORSERVICE_NAME
@@ -420 +417 @@
 const int components_length = sizeof(components) / sizeof(components[0]);
 
-// gMemory will be freed during shutdown.
-static nsIMemory* gMemory = nsnull;
-nsresult NS_COM NS_GetMemoryManager(nsIMemory* *result)
-{
-    nsresult rv = NS_OK;
-    if (!gMemory)
-    {
-        rv = nsMemoryImpl::Create(nsnull,
-                                  NS_GET_IID(nsIMemory),
-                                  (void**)&gMemory);
-    }
-    NS_IF_ADDREF(*result = gMemory);
-    return rv;
-}
-
 // gDebug will be freed during shutdown.
 static nsIDebug* gDebug = nsnull;
@@ -500 +482 @@
     // Establish the main thread here.
     rv = nsIThread::SetMainThread();
-    if (NS_FAILED(rv)) return rv;
-
-    // Startup the memory manager
-    rv = nsMemoryImpl::Startup();
     if (NS_FAILED(rv)) return rv;
 
@@ -586 +564 @@
         }
     }
-
-    nsCOMPtr<nsIMemory> memory;
-    NS_GetMemoryManager(getter_AddRefs(memory));
-    // dougt - these calls will be moved into a new interface when nsIComponentManager is frozen.
-    rv = compMgr->RegisterService(kMemoryCID, memory);
-    if (NS_FAILED(rv)) return rv;
 
     rv = compMgr->RegisterService(kComponentManagerCID, NS_STATIC_CAST(nsIComponentManager*, compMgr));
@@ -914 +886 @@
 
     EmptyEnumeratorImpl::Shutdown();
-    nsMemoryImpl::Shutdown();
-    NS_IF_RELEASE(gMemory);
 
     nsThread::Shutdown();

trunk/src/libs/xpcom18a4/xpcom/glue/nsMemory.cpp

@@ -36 +36 @@
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsXPCOM.h"
 #include "nsMemory.h"
-#include "nsXPCOMPrivate.h"
 
-static nsIMemory* gMemory = nsnull;
-
-static NS_METHOD FreeGlobalMemory(void)
-{
-    NS_ASSERTION(gMemory, "must be not null after SetupGlobalMemory");
-    NS_IF_RELEASE(gMemory);
-    return NS_OK;
-}
-
-#define ENSURE_ALLOCATOR \
-  (gMemory ? PR_TRUE : (PRBool)(SetupGlobalMemory() != nsnull))
-
-static nsIMemory*
-SetupGlobalMemory()
-{
-    NS_ASSERTION(!gMemory, "must be called once");
-    if (!gMemory)
-    {
-        NS_GetMemoryManager(&gMemory);
-        NS_ASSERTION(gMemory, "can't get memory manager!");
-        if (gMemory)
-            NS_RegisterXPCOMExitRoutine(FreeGlobalMemory, 0);
-    }
-    return gMemory;
-}
-
-#ifdef XPCOM_GLUE
-nsresult GlueStartupMemory() 
-{
-    NS_ASSERTION(!gMemory, "must be called once");
-    if (!gMemory)
-    {
-        NS_GetMemoryManager(&gMemory);
-        NS_ASSERTION(gMemory, "can't get memory manager!");
-        if (!gMemory)
-            return NS_ERROR_FAILURE;
-    }
-    return NS_OK;
-}
-
-void GlueShutdownMemory()
-{
-    NS_IF_RELEASE(gMemory);
-}
-#endif
+#include <iprt/mem.h>
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -92 +46 @@
 nsMemory::Alloc(PRSize size)
 {
-    if (!ENSURE_ALLOCATOR)
-        return nsnull;
- 
-   return gMemory->Alloc(size);
+    return RTMemAlloc(size);
 }
 
@@ -101 +52 @@
 nsMemory::Realloc(void* ptr, PRSize size)
 {
-    if (!ENSURE_ALLOCATOR)
-        return nsnull;    
-
-    return gMemory->Realloc(ptr, size);
+    return RTMemRealloc(ptr, size);
 }
 
@@ -110 +58 @@
 nsMemory::Free(void* ptr)
 {
-    if (!ENSURE_ALLOCATOR)
-        return;    
-
-    gMemory->Free(ptr);
-}
-
-NS_COM nsresult
-nsMemory::HeapMinimize(PRBool aImmediate)
-{
-    if (!ENSURE_ALLOCATOR)
-        return NS_ERROR_FAILURE;    
-
-    return gMemory->HeapMinimize(aImmediate);
+    RTMemFree(ptr);
 }
 
@@ -128 +64 @@
 nsMemory::Clone(const void* ptr, PRSize size)
 {
-    if (!ENSURE_ALLOCATOR)
-        return nsnull;    
-
-    void* newPtr = gMemory->Alloc(size);
-    if (newPtr)
-        memcpy(newPtr, ptr, size);
-    return newPtr;
-}
-
-NS_COM nsIMemory*
-nsMemory::GetGlobalMemoryService()
-{
-    if (!ENSURE_ALLOCATOR)
-        return nsnull;    
-   
-    nsIMemory* result = gMemory;
-    NS_IF_ADDREF(result);
-    return result;
+    return RTMemDup(ptr, size);
 }
 

trunk/src/libs/xpcom18a4/xpcom/glue/nsMemory.h

@@ -39 +39 @@
 #define nsMemory_h__
 
-#include "nsIMemory.h"
-
-#define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1"
-#define NS_MEMORY_CLASSNAME  "Global Memory Service"
-#define NS_MEMORY_CID                                \
-{ /* 30a04e40-38e7-11d4-8cf5-0060b0fc14a3 */         \
-    0x30a04e40,                                      \
-    0x38e7,                                          \
-    0x11d4,                                          \
-    {0x8c, 0xf5, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
+#include "nsISupports.h"
 
 
@@ -67 +57 @@
     static NS_COM void*      Realloc(void* ptr, size_t size);
     static NS_COM void       Free(void* ptr);
-    static NS_COM nsresult   HeapMinimize(PRBool aImmediate);
     static NS_COM void*      Clone(const void* ptr, size_t size);
-    static NS_COM nsIMemory* GetGlobalMemoryService();       // AddRefs
 };