smpi: initialize fields, and don't reset the actor each time we change the attached...

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index 0a0a3b3..42ec9d8 100644 (file)
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -200,7 +200,7 @@ std::vector<Storage*> Engine::get_all_storages()
  */
 simgrid::s4u::Storage* Engine::storage_by_name(std::string name)
 {
-  if (pimpl->links_.find(name) == pimpl->links_.end())
+  if (pimpl->storages_.find(name) == pimpl->storages_.end())
     throw std::invalid_argument(std::string("Storage not found: ") + name);
 
   return pimpl->storages_.at(name);

diff --git a/src/smpi/include/smpi_process.hpp b/src/smpi/include/smpi_process.hpp
index eaa3ed1..68d717b 100644 (file)
--- a/src/smpi/include/smpi_process.hpp
+++ b/src/smpi/include/smpi_process.hpp
@@ -35,7 +35,7 @@ class Process {
     simgrid::s4u::Barrier* finalization_barrier_;
     smpi_trace_call_location_t trace_call_loc_;
     simgrid::s4u::ActorPtr actor_ = nullptr;
-    smpi_privatization_region_t privatized_region_;
+    smpi_privatization_region_t privatized_region_ = nullptr;
     int optind=0; /*for getopt replacement */
 #if HAVE_PAPI
   /** Contains hardware data as read by PAPI **/

diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp
index 996fc71..48f6c6e 100644 (file)
--- a/src/smpi/internals/smpi_process.cpp
+++ b/src/smpi/internals/smpi_process.cpp
@@ -70,7 +70,6 @@ void Process::set_data(int* argc, char*** argv)
   if (barrier != nullptr) // don't overwrite the current one if the instance has none
     finalization_barrier_ = barrier;
 
-  actor_                                                                        = simgrid::s4u::Actor::self();
   static_cast<simgrid::msg::ActorExt*>(actor_->get_impl()->get_user_data())->data = this;
 
   if (*argc > 3) {