actually fix the memleak around smpi's process_data

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

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 82fa33c..afabcb8 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -87,7 +87,6 @@ void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_com
 void smpi_add_process(ActorPtr actor)
 {
   process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)});
-  // smpi_deployment_register_process("master_mpi", 0, actor);
 }
 
 int smpi_process_count()
@@ -629,6 +628,13 @@ void SMPI_init(){
   simgrid::s4u::Actor::onCreation.connect([](simgrid::s4u::ActorPtr actor) {
     smpi_add_process(actor);
   });
+  simgrid::s4u::Actor::onDestruction.connect([](simgrid::s4u::ActorPtr actor) {
+    if (process_data.find(actor) != process_data.end()) {
+      delete process_data.at(actor);
+      process_data.erase(actor);
+    }
+  });
+
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();