Merge branch 'master' of https://framagit.org/simgrid/simgrid

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index 7bec1ec..2b22f1e 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -7,7 +7,6 @@
 #include "simgrid/Exception.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/instr/instr_private.hpp"
-#include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
@@ -72,31 +71,27 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun
   if (code)
     function = simgrid::xbt::wrap_main(code, argc, static_cast<const char* const*>(argv));
 
-  std::unordered_map<std::string, std::string> props;
+  simgrid::s4u::ActorPtr actor = simgrid::s4u::Actor::init(std::move(name), host);
+  actor->extension<simgrid::msg::ActorUserData>()->set_user_data(data);
+
   xbt_dict_cursor_t cursor = nullptr;
   char* key;
   char* value;
   xbt_dict_foreach (properties, cursor, key, value)
-    props[key] = value;
+    actor->set_property(key, value);
   xbt_dict_free(&properties);
 
-  simgrid::s4u::ActorPtr actor = nullptr;
   try {
-    actor = simgrid::s4u::Actor::init(std::move(name), host);
-    actor->extension<simgrid::msg::ActorUserData>()->set_user_data(data);
     actor->start(std::move(function));
   } catch (simgrid::HostFailureException const&) {
-    xbt_die("Could not create a new process on failed host %s.", host->get_cname());
+    xbt_die("Could not launch a new process on failed host %s.", host->get_cname());
   }
 
   for (int i = 0; i != argc; ++i)
     xbt_free(argv[i]);
   xbt_free(argv);
 
-  if (actor == nullptr)
-    return nullptr;
-
-  MSG_process_yield();
+  simgrid::s4u::this_actor::yield();
   return actor.get();
 }
 

diff --git a/teshsuite/msg/cloud-migration/cloud-migration.tesh b/teshsuite/msg/cloud-migration/cloud-migration.tesh
index 124b61a..d4812c6 100644 (file)
--- a/teshsuite/msg/cloud-migration/cloud-migration.tesh
+++ b/teshsuite/msg/cloud-migration/cloud-migration.tesh
@@ -4,9 +4,9 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-migration ${platfdir}/small_platform.xml --l
 > [132.765801] (1:master_@Fafard) Test: Migrate a VM with 100 Mbytes RAM
 > [146.111793] (1:master_@Fafard) VM0 migrated: Fafard->Tremblay in 13.346 s
 > [146.111793] (1:master_@Fafard) Test: Migrate two VMs at once from PM0 to PM1
-> [411.566271] (8:mig_wrk@Fafard) VM1 migrated: Fafard->Tremblay in 265.454 s
+> [411.566271] (7:mig_wrk@Fafard) VM1 migrated: Fafard->Tremblay in 265.454 s
 > [411.566271] (6:mig_wrk@Fafard) VM0 migrated: Fafard->Tremblay in 265.454 s
 > [10146.111793] (1:master_@Fafard) Test: Migrate two VMs at once to different PMs
-> [10362.620589] (14:mig_wrk@Fafard) VM1 migrated: Fafard->Bourassa in 216.509 s
+> [10362.620589] (13:mig_wrk@Fafard) VM1 migrated: Fafard->Bourassa in 216.509 s
 > [10411.547334] (12:mig_wrk@Fafard) VM0 migrated: Fafard->Tremblay in 265.436 s
 > [20146.111793] (0:maestro@) Bye (simulation time 20146.1)