Merge branch 'udpor-phase6' into 'master'

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

diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp
index 3b9921e..66917b4 100644 (file)
--- a/src/smpi/internals/smpi_actor.cpp
+++ b/src/smpi/internals/smpi_actor.cpp
@@ -4,16 +4,16 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/smpi/include/smpi_actor.hpp"
-#include "mc/mc.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Mutex.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_info.hpp"
+#include "src/mc/mc.h"
 #include "src/mc/mc_replay.hpp"
 #include "xbt/str.h"
 
 #if HAVE_PAPI
-#include "papi.h"
+#include <papi.h>
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)");
@@ -233,7 +233,10 @@ void ActorExt::init()
     return;
 
   const simgrid::s4u::Actor* self = simgrid::s4u::Actor::self();
-  ext->instance_id_ = self->get_property("instance_id");
+  const char* id                  = self->get_property("instance_id");
+  xbt_assert(id != nullptr, "Actor '%s' seem to be calling MPI_Init(), but it was created outside of MPI, wasn't it?",
+             self->get_cname());
+  ext->instance_id_ = id;
   const int rank = static_cast<int>(xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank"));
 
   ext->state_ = SmpiProcessState::INITIALIZING;