Changeset 15508 in vbox for trunk

Timestamp:

Dec 15, 2008 3:05:16 PM (16 years ago)

Author:

vboxsync

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

40989

Message:

#3349: Changed a few MMHyperAlloc calls to MMR3HyperAllocOnceNoRel to save heap space.

Location:

trunk/src/VBox

Files:

• Devices/Storage/DevATA.cpp (modified) (2 diffs)
• VMM/MMHyper.cpp (modified) (1 diff)
• VMM/VMM.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -201 +201 @@
     /** Pointer to the I/O buffer. */
     RCPTRTYPE(uint8_t *) pbIOBufferRC;
-    
+
     RTRCPTR Aligmnent1; /**< Align the statistics at an 8-byte boundrary. */
 
@@ -5588 +5588 @@
             pIf->cbIOBuffer = ATA_MAX_MULT_SECTORS * 512;
         Assert(!pIf->pbIOBufferR3);
-        rc = MMHyperAlloc(pVM, pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferR3); /** @todo rainy day: change to MMR3HyperAllocOnceNoRel */
+        rc = MMR3HyperAllocOnceNoRel(pVM, pIf->cbIOBuffer, 0, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferR3);
         if (RT_FAILURE(rc))
             return VERR_NO_MEMORY;

trunk/src/VBox/VMM/MMHyper.cpp

@@ -840 +840 @@
     /*
      * Choose between allocating a new chunk of HMA memory
-     * and the heap. We will only do BIG allocations from HMA.
-     */
-    if (    cb < _64K
-        &&  (   uAlignment != PAGE_SIZE
-             || cb < 48*_1K))
+     * and the heap. We will only do BIG allocations from HMA and
+     * only at creation time.
+     */
+    if (   (   cb < _64K
+            && (   uAlignment != PAGE_SIZE
+               || cb < 48*_1K))
+        ||  VMR3GetState(pVM) != VMSTATE_CREATING)
     {
         int rc = MMHyperAlloc(pVM, cb, uAlignment, enmTag, ppv);

trunk/src/VBox/VMM/VMM.cpp

@@ -224 +224 @@
     /** @todo SMP: On stack per vCPU. */
 #ifdef VBOX_STRICT_VMM_STACK
-    int rc = MMHyperAlloc(pVM, VMM_STACK_SIZE + PAGE_SIZE + PAGE_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVM->vmm.s.pbEMTStackR3);
+    int rc = MMR3HyperAllocOnceNoRel(pVM, VMM_STACK_SIZE + PAGE_SIZE + PAGE_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVM->vmm.s.pbEMTStackR3);
 #else
-    int rc = MMHyperAlloc(pVM, VMM_STACK_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVM->vmm.s.pbEMTStackR3);
+    int rc = MMR3HyperAllocOnceNoRel(pVM, VMM_STACK_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVM->vmm.s.pbEMTStackR3);
 #endif
     if (RT_SUCCESS(rc))
@@ -266 +266 @@
     {
         pVM->vmm.s.cbRCLogger = RT_OFFSETOF(RTLOGGERRC, afGroups[pLogger->cGroups]);
-        rc = MMHyperAlloc(pVM, pVM->vmm.s.cbRCLogger, 0, MM_TAG_VMM, (void **)&pVM->vmm.s.pRCLoggerR3);
+        rc = MMR3HyperAllocOnceNoRel(pVM, pVM->vmm.s.cbRCLogger, 0, MM_TAG_VMM, (void **)&pVM->vmm.s.pRCLoggerR3);
         if (RT_FAILURE(rc))
             return rc;
@@ -272 +272 @@
 
 # ifdef VBOX_WITH_R0_LOGGING
-        rc = MMHyperAlloc(pVM, RT_OFFSETOF(VMMR0LOGGER, Logger.afGroups[pLogger->cGroups]),
-                          0, MM_TAG_VMM, (void **)&pVM->vmm.s.pR0LoggerR3);
+        rc = MMR3HyperAllocOnceNoRel(pVM, RT_OFFSETOF(VMMR0LOGGER, Logger.afGroups[pLogger->cGroups]),
+                                     0, MM_TAG_VMM, (void **)&pVM->vmm.s.pR0LoggerR3);
         if (RT_FAILURE(rc))
             return rc;
@@ -292 +292 @@
     {
         pVM->vmm.s.cbRCRelLogger = RT_OFFSETOF(RTLOGGERRC, afGroups[pRelLogger->cGroups]);
-        rc = MMHyperAlloc(pVM, pVM->vmm.s.cbRCRelLogger, 0, MM_TAG_VMM, (void **)&pVM->vmm.s.pRCRelLoggerR3);
+        rc = MMR3HyperAllocOnceNoRel(pVM, pVM->vmm.s.cbRCRelLogger, 0, MM_TAG_VMM, (void **)&pVM->vmm.s.pRCRelLoggerR3);
         if (RT_FAILURE(rc))
             return rc;