Ticket #2808: valgrind_mempool.diff

source/lib/allocators/dynarray.cpp

@@ -30 +30 @@
 #include "lib/alignment.h"
 #include "lib/sysdep/vm.h"
 
+#include "valgrind.h"
 
 static Status validate_da(DynArray* da)
 {
@@ -73 +74 @@
     da->cur_size_pa = 0;
     da->pos         = 0;
     CHECK_DA(da);
+
+    VALGRIND_CREATE_MEMPOOL(da, 0, 0);
+
     return INFO::OK;
 }
 
@@ -86 +90 @@
     // wipe out the DynArray for safety
     memset(da, 0, sizeof(*da));
 
+    if (da->cur_size_pa)
+        VALGRIND_MEMPOOL_FREE(da, da->base);
+    VALGRIND_DESTROY_MEMPOOL(da);
+
     return INFO::OK;
 }
 
@@ -113 +121 @@
         ok = vm::Commit(uintptr_t(end), size_delta_pa);
         if(!ok)
             debug_printf(L"Commit failed (%p %lld)\n", end, (long long)size_delta_pa);
+
+        if(cur_size_pa == 0)
+            VALGRIND_MEMPOOL_ALLOC(da, da->base, new_size_pa);
+        else
+            VALGRIND_MEMPOOL_CHANGE(da, da->base, da->base, new_size_pa);
     }
     // shrinking
     else if(size_delta_pa < 0)
+    {
         ok = vm::Decommit(uintptr_t(end+size_delta_pa), -size_delta_pa);
+        if(new_size_pa)
+            VALGRIND_MEMPOOL_TRIM(da, da->base, new_size_pa);
+        else
+            VALGRIND_MEMPOOL_FREE(da, da->base);
+    }
     // else: no change in page count, e.g. if going from size=1 to 2
     // (we don't want mem_* to have to handle size=0)