Changeset 28317 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Apr 14, 2010 6:06:05 PM (15 years ago)

Author:

vboxsync

Message:

RTMemPageFree + all users: Added size parameter to RTMemPageFree so we can avoid tracking structures when using mmap/munmap.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceBalloon.cpp (modified) (2 diffs)
• VBoxServiceClipboard-os2.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp

@@ -69 +69 @@
     void *pv = RTMemPageAlloc(PAGE_SIZE);
     g_fSysMadviseWorks = madvise(pv, PAGE_SIZE, MADV_DONTFORK) == 0;
-    RTMemPageFree(pv);
+    RTMemPageFree(pv, PAGE_SIZE);
 #endif
 }
@@ -148 +148 @@
 #else
 
-    RTMemPageFree(pu8);
+    RTMemPageFree(pu8, cb);
 
 #endif

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp

@@ -423 +423 @@
          */
         uint32_t cb = _4K;
-        int rc = VERR_NO_MEMORY;
-        void *pv = RTMemPageAllocZ(cb);
+        uint32_t cbAllocated = cb;
+        int      rc = VERR_NO_MEMORY;
+        void    *pv = RTMemPageAllocZ(cbAllocated);
         if (pv)
         {
@@ -431 +432 @@
             if (rc == VINF_BUFFER_OVERFLOW)
             {
-                RTMemPageFree(pv);
-                cb = RT_ALIGN_32(cb, PAGE_SIZE);
-                pv = RTMemPageAllocZ(cb);
+                RTMemPageFree(pv, cbAllocated);
+                cbAllocated = cb = RT_ALIGN_32(cb, PAGE_SIZE);
+                pv = RTMemPageAllocZ(cbAllocated);
                 rc = VbglR3ClipboardReadData(g_u32ClientId, fFormat, pv, cb, &cb);
             }
             if (RT_FAILURE(rc))
-                RTMemPageFree(pv);
+                RTMemPageFree(pv, cbAllocated);
         }
         if (RT_SUCCESS(rc))
@@ -458 +459 @@
                 }
             }
-            RTMemPageFree(pv);
+            RTMemPageFree(pv, cbAllocated);
         }
         else