commit 21017c6cbef12e49ea93dc2eb414dfaf0c5e6618
author Adam Sawicki <Adam.Sawicki@amd.com> Fri Sep 07 15:26:59 2018 +0200
committer Adam Sawicki <Adam.Sawicki@amd.com> Fri Sep 07 15:26:59 2018 +0200
tree 53b8666e81d939c347c4becacf30535ea2f22d87
parent 6540b19ed5ff8cb00b2c08b91a08b997ded5717e

Implemented VmaBlockMetadata_Linear::AddPoolStats.

src/Tests.cpp

diff --git a/src/Tests.cpp b/src/Tests.cpp
index 8aabf1e..1527657 100644
--- a/src/Tests.cpp
+++ b/src/Tests.cpp
@@ -4133,6 +4133,10 @@
 

     SaveAllocatorStatsToFile(L"BuddyTest01.json");

 

+    VmaPoolStats stats = {};

+    vmaGetPoolStats(g_hAllocator, pool, &stats);

+    int DBG = 0; // Set breakpoint here to inspect `stats`.

+

     // Destroy the buffers in random order.

     while(!bufInfo.empty())

     {

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index dda30af..be39a50 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -5004,10 +5004,12 @@
     struct ValidationContext

     {

         size_t calculatedAllocationCount;

+        size_t calculatedFreeCount;

         VkDeviceSize calculatedSumFreeSize;

 

         ValidationContext() :

             calculatedAllocationCount(0),

+            calculatedFreeCount(0),

             calculatedSumFreeSize(0) { }

     };

 

@@ -5049,6 +5051,7 @@
     } m_FreeList[MAX_LEVELS];

     // Number of nodes in the tree with type == TYPE_ALLOCATION.

     size_t m_AllocationCount;

+    size_t m_FreeCount;

     VkDeviceSize m_SumFreeSize;

 

     void DeleteNode(Node* node);

@@ -9173,6 +9176,7 @@
 VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator) :

     m_Root(VMA_NULL),

     m_AllocationCount(0),

+    m_FreeCount(1),

     m_SumFreeSize(0)

 {

     memset(m_FreeList, 0, sizeof(m_FreeList));

@@ -9265,7 +9269,11 @@
 

 void VmaBlockMetadata_Buddy::AddPoolStats(VmaPoolStats& inoutStats) const

 {

-    // TODO

+    inoutStats.size += GetSize();

+    inoutStats.unusedSize += m_SumFreeSize;

+    inoutStats.allocationCount += m_AllocationCount;

+    inoutStats.unusedRangeCount += m_FreeCount;

+    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax());

 }

 

 #if VMA_STATS_STRING_ENABLED

@@ -9386,6 +9394,7 @@
 

         ++currLevel;

         currNode = m_FreeList[currLevel].front;

+        ++m_FreeCount;

     }

 

     // Remove from free list.

@@ -9397,6 +9406,7 @@
     currNode->allocation.alloc = hAllocation;

 

     ++m_AllocationCount;

+    --m_FreeCount;

     m_SumFreeSize -= LevelToNodeSize(currLevel);

 }

 

@@ -9421,6 +9431,7 @@
     case Node::TYPE_FREE:

         // curr->free.prev, next are validated separately.

         ctx.calculatedSumFreeSize += levelNodeSize;

+        ++ctx.calculatedFreeCount;

         break;

     case Node::TYPE_ALLOCATION:

         ++ctx.calculatedAllocationCount;

@@ -9504,6 +9515,7 @@
     VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION);

     VMA_ASSERT(alloc == VK_NULL_HANDLE || node->allocation.alloc == alloc);

 

+    ++m_FreeCount;

     --m_AllocationCount;

     m_SumFreeSize += levelSize;

 

@@ -9521,6 +9533,7 @@
         

         node = parent;

         --level;

+        --m_FreeCount;

     }

 

     AddToFreeListFront(level, node);