Fix multiple memleaks in the replay of multiple SMPI instances

diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/replay.hpp
index 89a7177..21e09f7 100644 (file)
--- a/include/simgrid/smpi/replay.hpp
+++ b/include/simgrid/smpi/replay.hpp
@@ -34,7 +34,6 @@
 XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
 XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
 XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);
 XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
 XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
 XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);

-XBT_PRIVATE void smpi_free_replay_tmp_buffers();

 
 XBT_PRIVATE void log_timed_action(simgrid::xbt::ReplayAction& action, double clock);
 
 
 XBT_PRIVATE void log_timed_action(simgrid::xbt::ReplayAction& action, double clock);
 

diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp
index 4b96a33..8292cd7 100644 (file)
--- a/src/smpi/include/private.hpp
+++ b/src/smpi/include/private.hpp
@@ -102,7 +102,6 @@ XBT_PRIVATE void smpi_shared_destroy();
 XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
 XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
 XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);
 XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
 XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
 XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);

-XBT_PRIVATE void smpi_free_replay_tmp_buffers();

 
 extern "C" {
 // f77 wrappers
 
 extern "C" {
 // f77 wrappers

diff --git a/src/smpi/internals/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp
index 1b41547..f11d759 100644 (file)
--- a/src/smpi/internals/smpi_memory.cpp
+++ b/src/smpi/internals/smpi_memory.cpp
@@ -247,10 +247,10 @@ void smpi_destroy_global_memory_segments(){
 //allocate a single buffer for all sends, and an other of all reads, for each actor.
 //buffer size is growing if needed
 
 //allocate a single buffer for all sends, and an other of all reads, for each actor.
 //buffer size is growing if needed
 

-typedef std::tuple</*buffer adress*/ char*, /*buffer size*/ int> buffer_tuple;
+typedef std::tuple</*buffer adress*/ void*, /*buffer size*/ int> buffer_tuple;

 static std::map<aid_t, buffer_tuple> sendbuffer_map;
 static std::map<aid_t, buffer_tuple> recvbuffer_map;
 static std::map<aid_t, buffer_tuple> sendbuffer_map;
 static std::map<aid_t, buffer_tuple> recvbuffer_map;

-static void* smpi_get_tmp_buffer(int size, std::map<aid_t, buffer_tuple> buffer_map)
+static void* smpi_get_tmp_buffer(int size, std::map<aid_t, buffer_tuple>* buffer_map)

 {
   // Because this kind of process maintain is own list of buffers and call
   // `smpi_free_tmp_buffer(void* buf)` to free them
 {
   // Because this kind of process maintain is own list of buffers and call
   // `smpi_free_tmp_buffer(void* buf)` to free them


@@ -259,36 +259,36 @@ static void* smpi_get_tmp_buffer(int size, std::map<aid_t, buffer_tuple> buffer_
 
   // check if the process is registered
   aid_t id = simgrid::s4u::this_actor::get_pid();
 
   // check if the process is registered
   aid_t id = simgrid::s4u::this_actor::get_pid();

-  if (not (buffer_map.find(id) == buffer_map.end()))
-  {
+  if (buffer_map->find(id) == buffer_map->end()) {

     // This tuple represents a buffer and his size
     buffer_tuple buffer_tuple(nullptr, 0);
     // This tuple represents a buffer and his size
     buffer_tuple buffer_tuple(nullptr, 0);

-    buffer_map[id] = buffer_tuple;
+    (*buffer_map)[id] = buffer_tuple;
+    simgrid::s4u::this_actor::on_exit(
+        [id, buffer_map](int status, void* ignored) {
+          xbt_free(std::get<0>((*buffer_map)[id]));
+          std::get<0>((*buffer_map)[id]) = nullptr;
+        },
+        nullptr);

   }
   }

-  if (std::get<1>(buffer_map[id]) < size){
-      std::get<0>(buffer_map[id]) = static_cast<char*>(xbt_realloc(std::get<0>(buffer_map[id]), size));
-      std::get<1>(buffer_map[id]) = size;
+
+  if (std::get<1>((*buffer_map)[id]) < size) {
+    std::get<0>((*buffer_map)[id]) = xbt_realloc(std::get<0>((*buffer_map)[id]), size);
+    std::get<1>((*buffer_map)[id]) = size;

   }
   }

-  return std::get<0>(buffer_map[id]);
+  return std::get<0>((*buffer_map)[id]);

 }
 
 void* smpi_get_tmp_sendbuffer(int size)
 {
 }
 
 void* smpi_get_tmp_sendbuffer(int size)
 {

-    return smpi_get_tmp_buffer(size, sendbuffer_map);
+  return smpi_get_tmp_buffer(size, &sendbuffer_map);

 }
 
 void* smpi_get_tmp_recvbuffer(int size)
 {
 }
 
 void* smpi_get_tmp_recvbuffer(int size)
 {

-    return smpi_get_tmp_buffer(size, recvbuffer_map);
+  return smpi_get_tmp_buffer(size, &recvbuffer_map);

 }
 
 void smpi_free_tmp_buffer(void* buf){
   if (not smpi_process()->replaying())
     xbt_free(buf);
 }
 }
 
 void smpi_free_tmp_buffer(void* buf){
   if (not smpi_process()->replaying())
     xbt_free(buf);
 }

-
-void smpi_free_replay_tmp_buffers(){
-  aid_t id = simgrid::s4u::this_actor::get_pid();
-  xbt_free(std::get<0>(recvbuffer_map[id]));
-  xbt_free(std::get<0>(sendbuffer_map[id]));
-}

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index d55ff23..d6afe8e 100644 (file)
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -782,7 +782,6 @@ void smpi_replay_main(int* argc, char*** argv)
   if(active_processes==0){
     /* Last process alive speaking: end the simulated timer */
     XBT_INFO("Simulation time %f", smpi_process()->simulated_elapsed());
   if(active_processes==0){
     /* Last process alive speaking: end the simulated timer */
     XBT_INFO("Simulation time %f", smpi_process()->simulated_elapsed());

-    smpi_free_replay_tmp_buffers();

   }
 
   TRACE_smpi_comm_in(simgrid::s4u::this_actor::get_pid(), "smpi_replay_run_finalize",
   }
 
   TRACE_smpi_comm_in(simgrid::s4u::this_actor::get_pid(), "smpi_replay_run_finalize",