Count all intercepted allocations/deallocations in order to build a small leak-checker.

[simgrid.git] / src / smpi / internals / smpi_shared.cpp

diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp
index b495246..dfc99b8 100644 (file)
--- a/src/smpi/internals/smpi_shared.cpp
+++ b/src/smpi/internals/smpi_shared.cpp
@@ -39,6 +39,7 @@
 
 #include "private.hpp"
 #include "xbt/config.hpp"
+#include "xbt/file.hpp"
 
 #include <cerrno>
 
@@ -304,8 +305,12 @@ void* smpi_shared_malloc_partial(size_t size, const size_t* shared_block_offsets
 void* smpi_shared_malloc_intercept(size_t size, const char* file, int line)
 {
   if( smpi_cfg_auto_shared_malloc_thresh() == 0 || size < smpi_cfg_auto_shared_malloc_thresh()){
-    simgrid::smpi::utils::account_malloc_size(size, file, line);
-    return ::operator new(size);
+    void* ptr = ::operator new(size);
+    if(not smpi_cfg_trace_call_use_absolute_path())
+      simgrid::smpi::utils::account_malloc_size(size, simgrid::xbt::Path(file).get_base_name(), line, ptr);
+    else
+      simgrid::smpi::utils::account_malloc_size(size, file, line, ptr);
+    return ptr;
   } else {
     simgrid::smpi::utils::account_shared_size(size);
     return smpi_shared_malloc(size, file, line);
@@ -315,8 +320,11 @@ void* smpi_shared_malloc_intercept(size_t size, const char* file, int line)
 void* smpi_shared_calloc_intercept(size_t num_elm, size_t elem_size, const char* file, int line)
 {
   if( smpi_cfg_auto_shared_malloc_thresh() == 0 || elem_size*num_elm < smpi_cfg_auto_shared_malloc_thresh()){
-    simgrid::smpi::utils::account_malloc_size(elem_size*num_elm, file, line);
     void* ptr = ::operator new(elem_size*num_elm);
+    if(not smpi_cfg_trace_call_use_absolute_path())
+      simgrid::smpi::utils::account_malloc_size(elem_size*num_elm, simgrid::xbt::Path(file).get_base_name(), line, ptr);
+    else
+      simgrid::smpi::utils::account_malloc_size(elem_size*num_elm, file, line, ptr);
     memset(ptr, 0, elem_size*num_elm);
     return ptr;
   } else {
@@ -406,6 +414,7 @@ std::vector<std::pair<size_t, size_t>> merge_private_blocks(const std::vector<st
 
 void smpi_shared_free(void *ptr)
 {
+  simgrid::smpi::utils::account_free(ptr);
   if (smpi_cfg_shared_malloc() == SharedMallocType::LOCAL) {
     auto meta = allocs_metadata.find(ptr);
     if (meta == allocs_metadata.end()) {