Changeset 50482 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Feb 17, 2014 3:23:05 PM (11 years ago)

Author:

vboxsync

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

92323

Message:

Build HGSMI memory allocator (unused)

Location:

trunk/src/VBox/GuestHost/HGSMI

Files:

• HGSMICommon.cpp (modified) (11 diffs)
• Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -189 +189 @@
 }
 
-void HGSMIHeapSetupUnitialized (HGSMIHEAP *pHeap)
-{
-    pHeap->u.hPtr = NIL_RTHEAPSIMPLE;
-    pHeap->cRefs = 0;
-    pHeap->area.cbArea = 0;
-    pHeap->area.offBase = HGSMIOFFSET_VOID;
-    pHeap->area.offLast = HGSMIOFFSET_VOID;
-    pHeap->area.pu8Base = 0;
-    pHeap->fOffsetBased = false;
-}
-
-bool HGSMIHeapIsItialized (HGSMIHEAP *pHeap)
-{
-    return pHeap->u.hPtr != NIL_RTHEAPSIMPLE;
+void HGSMIHeapSetupUninitialized(HGSMIHEAP *pHeap)
+{
+    RT_ZERO(*pHeap);
+    pHeap->u32HeapType = HGSMI_HEAP_TYPE_NULL;
 }
 
 int HGSMIHeapRelocate (HGSMIHEAP *pHeap,
+                       uint32_t u32HeapType,
                        void *pvBase,
                        uint32_t offHeapHandle,
@@ -211 +202 @@
                        HGSMISIZE cbArea,
                        HGSMIOFFSET offBase,
-                       bool fOffsetBased
-                       )
+                       const HGSMIENV *pEnv)
 {
     if (   !pHeap
@@ -224 +214 @@
     if (RT_SUCCESS (rc))
     {
-        if (fOffsetBased)
+        if (u32HeapType == HGSMI_HEAP_TYPE_MA)
+        {
+            /* @todo rc = HGSMIMAInit(&pHeap->u.ma, &pHeap->area, NULL, 0, 0, pEnv); */
+            rc = VERR_NOT_IMPLEMENTED;
+        }
+        else if (u32HeapType == HGSMI_HEAP_TYPE_OFFSET)
+        {
             pHeap->u.hOff = (RTHEAPOFFSET)((uint8_t *)pvBase + offHeapHandle);
-        else
+        }
+        else if (u32HeapType == HGSMI_HEAP_TYPE_POINTER)
         {
             pHeap->u.hPtr = (RTHEAPSIMPLE)((uint8_t *)pvBase + offHeapHandle);
             rc = RTHeapSimpleRelocate (pHeap->u.hPtr, offDelta); AssertRC(rc);
         }
-        if (RT_SUCCESS (rc))
+        else
+        {
+            rc = VERR_NOT_SUPPORTED;
+        }
+
+        if (RT_SUCCESS(rc))
         {
             pHeap->cRefs = 0;
-            pHeap->fOffsetBased = fOffsetBased;
+            pHeap->u32HeapType = u32HeapType;
         }
         else
@@ -246 +248 @@
 
 int HGSMIHeapSetup (HGSMIHEAP *pHeap,
+                    uint32_t u32HeapType,
                     void *pvBase,
                     HGSMISIZE cbArea,
                     HGSMIOFFSET offBase,
-                    bool fOffsetBased)
+                    const HGSMIENV *pEnv)
 {
     if (   !pHeap
@@ -261 +264 @@
     if (RT_SUCCESS (rc))
     {
-        if (!fOffsetBased)
+        if (u32HeapType == HGSMI_HEAP_TYPE_MA)
+        {
+            rc = HGSMIMAInit(&pHeap->u.ma, &pHeap->area, NULL, 0, 0, pEnv);
+        }
+        else if (u32HeapType == HGSMI_HEAP_TYPE_POINTER)
+        {
             rc = RTHeapSimpleInit (&pHeap->u.hPtr, pvBase, cbArea);
+        }
+        else if (u32HeapType == HGSMI_HEAP_TYPE_OFFSET)
+        {
+            rc = RTHeapOffsetInit (&pHeap->u.hOff, pvBase, cbArea);
+        }
         else
-            rc = RTHeapOffsetInit (&pHeap->u.hOff, pvBase, cbArea);
+        {
+            rc = VERR_NOT_SUPPORTED;
+        }
 
         if (RT_SUCCESS (rc))
         {
             pHeap->cRefs = 0;
-            pHeap->fOffsetBased = fOffsetBased;
+            pHeap->u32HeapType = u32HeapType;
         }
         else
@@ -284 +299 @@
     if (pHeap)
     {
+        if (pHeap->u32HeapType == HGSMI_HEAP_TYPE_MA)
+        {
+            HGSMIMAUninit(&pHeap->u.ma);
+        }
         Assert(!pHeap->cRefs);
-        pHeap->u.hPtr = NIL_RTHEAPSIMPLE;
-        HGSMIAreaClear (&pHeap->area);
-        pHeap->cRefs = 0;
+        HGSMIHeapSetupUninitialized(pHeap);
     }
 }
@@ -296 +313 @@
                       uint16_t u16ChannelInfo)
 {
-    if (pHeap->u.hPtr == NIL_RTHEAPSIMPLE)
-    {
-        return NULL;
-    }
-
-    size_t cbAlloc = HGSMIBufferRequiredSize (cbData);
+    HGSMISIZE cbAlloc = HGSMIBufferRequiredSize (cbData);
 
     HGSMIBUFFERHEADER *pHeader = (HGSMIBUFFERHEADER *)HGSMIHeapBufferAlloc (pHeap, cbAlloc);
@@ -326 +338 @@
 {
     if (   pvData
-        && pHeap->u.hPtr != NIL_RTHEAPSIMPLE)
+        && pHeap->u32HeapType != HGSMI_HEAP_TYPE_NULL)
     {
         HGSMIBUFFERHEADER *pHeader = HGSMIBufferHeaderFromData (pvData);
@@ -336 +348 @@
 void* HGSMIHeapBufferAlloc (HGSMIHEAP *pHeap, HGSMISIZE cbBuffer)
 {
-    void* pvBuf;
-    if (!pHeap->fOffsetBased)
+    void* pvBuf = NULL;
+    if (pHeap->u32HeapType == HGSMI_HEAP_TYPE_MA)
+    {
+        pvBuf = HGSMIMAAlloc(&pHeap->u.ma, cbBuffer);
+    }
+    else if (pHeap->u32HeapType == HGSMI_HEAP_TYPE_POINTER)
+    {
         pvBuf = RTHeapSimpleAlloc (pHeap->u.hPtr, cbBuffer, 0);
-    else
+    }
+    else if (pHeap->u32HeapType == HGSMI_HEAP_TYPE_OFFSET)
+    {
         pvBuf = RTHeapOffsetAlloc (pHeap->u.hOff, cbBuffer, 0);
-
-    if (!pvBuf)
-        return NULL;
-
-    ++pHeap->cRefs;
+    }
+
+    if (pvBuf)
+    {
+        ++pHeap->cRefs;
+    }
+
     return pvBuf;
 }
 
 void HGSMIHeapBufferFree(HGSMIHEAP *pHeap,
-                    void *pvBuf)
-{
-    if (!pHeap->fOffsetBased)
+                         void *pvBuf)
+{
+    if (pHeap->u32HeapType == HGSMI_HEAP_TYPE_MA)
+    {
+        HGSMIMAFree(&pHeap->u.ma, pvBuf);
+    }
+    else if (pHeap->u32HeapType == HGSMI_HEAP_TYPE_POINTER)
+    {
         RTHeapSimpleFree (pHeap->u.hPtr, pvBuf);
-    else
+    }
+    else if (pHeap->u32HeapType == HGSMI_HEAP_TYPE_OFFSET)
+    {
         RTHeapOffsetFree (pHeap->u.hOff, pvBuf);
+    }
 
     --pHeap->cRefs;
@@ -377 +406 @@
     }
 
-    const HGSMIBUFFERHEADER *pHeader = HGSMIOffsetToPointer (pArea, offBuffer);
+    const HGSMIBUFFERHEADER *pHeader = (HGSMIBUFFERHEADER *)HGSMIOffsetToPointer (pArea, offBuffer);
 
     /* Quick check of the data size, it should be less than the maximum

trunk/src/VBox/GuestHost/HGSMI/Makefile.kmk

@@ -30 +30 @@
 HGSMIGuestR0Lib_DEFS         =
 HGSMIGuestR0Lib_SOURCES      = \
-        HGSMICommon.cpp
+        HGSMICommon.cpp \
+        HGSMIMemAlloc.cpp
 endif
 
@@ -40 +41 @@
 HGSMIHostR3Lib_DEFS          =
 HGSMIHostR3Lib_SOURCES       = \
-        HGSMICommon.cpp
+        HGSMICommon.cpp \
+        HGSMIMemAlloc.cpp
 
 include $(FILE_KBUILD_SUB_FOOTER)