X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d02714ee138a3bd9b02e0064b7a2aa26407e9e8..fe304706848f0a64477d4687b3ea97d5b9a0c35c:/src/msg/msg_process.cpp

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index d95e2db3c4..b50cdb583f 100644
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -7,18 +7,38 @@
 #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)");
 
-std::string instr_pid(msg_process_t proc)
+std::string instr_pid(simgrid::s4u::Actor const& proc)
 {
-  return std::string(proc->get_name()) + "-" + std::to_string(proc->get_pid());
+  return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid());
 }
 
-/******************************** Process ************************************/
+void MSG_process_userdata_init()
+{
+  if (not msg_global)
+    msg_global = new MSG_Global_t();
+
+  if (not simgrid::msg::ActorUserData::EXTENSION_ID.valid())
+    simgrid::msg::ActorUserData::EXTENSION_ID = simgrid::s4u::Actor::extension_create<simgrid::msg::ActorUserData>();
+  simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::Actor& actor) {
+    XBT_DEBUG("creating the extension to store user data");
+    actor.extension_set(new simgrid::msg::ActorUserData());
+  });
+
+  simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::Actor const& actor) {
+    // free the data if a function was provided
+    auto extension = actor.extension<simgrid::msg::ActorUserData>();
+    void* userdata = extension ? extension->get_user_data() : nullptr;
+    if (userdata && msg_global->process_data_cleanup) {
+      msg_global->process_data_cleanup(userdata);
+    }
+  });
+}
 
+/******************************** Process ************************************/
 /** @brief Creates and runs a new #msg_process_t.
  *
  * Does exactly the same as #MSG_process_create_with_arguments but without providing standard arguments
@@ -69,39 +89,35 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun
                                                   int argc, char **argv, xbt_dict_t properties)
 {
   xbt_assert(host != nullptr, "Invalid parameters: host param must not be nullptr");
-
   simgrid::simix::ActorCode function;
   if (code)
     function = simgrid::xbt::wrap_main(code, argc, static_cast<const char* const*>(argv));
 
-  std::unordered_map<std::string, std::string> props;
-  xbt_dict_cursor_t cursor = nullptr;
-  char* key;
-  char* value;
-  xbt_dict_foreach (properties, cursor, key, value)
-    props[key] = value;
-  xbt_dict_free(&properties);
+  simgrid::s4u::ActorPtr actor;
 
-  smx_actor_t self    = SIMIX_process_self();
-  smx_actor_t actor   = nullptr;
   try {
-    actor = simgrid::simix::simcall([name, function, data, host, &props, self] {
-      return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(function), data, host, &props, self)
-          .get();
-    });
+    if (data != nullptr) {
+      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)
+        actor->set_property(key, value);
+      actor->start(std::move(function));
+    } else
+      actor = simgrid::s4u::Actor::create(std::move(name), host, 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());
   }
 
+  xbt_dict_free(&properties);
   for (int i = 0; i != argc; ++i)
     xbt_free(argv[i]);
   xbt_free(argv);
 
-  if (actor == nullptr)
-    return nullptr;
-
-  MSG_process_yield();
-  return actor->ciface();
+  simgrid::s4u::this_actor::yield();
+  return actor.get();
 }
 
 /** @brief Returns the user data of a process.
@@ -113,7 +129,7 @@ void* MSG_process_get_data(msg_process_t process)
   xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
 
   /* get from SIMIX the MSG process data, and then the user data */
-  return process->get_impl()->get_user_data();
+  return process->extension<simgrid::msg::ActorUserData>()->get_user_data();
 }
 
 /** @brief Sets the user data of a process.
@@ -123,8 +139,7 @@ void* MSG_process_get_data(msg_process_t process)
 msg_error_t MSG_process_set_data(msg_process_t process, void *data)
 {
   xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
-
-  process->get_impl()->set_user_data(data);
+  process->extension<simgrid::msg::ActorUserData>()->set_user_data(data);
 
   return MSG_OK;
 }
@@ -187,9 +202,6 @@ msg_process_t MSG_process_self()
   return SIMIX_process_self()->ciface();
 }
 
-smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { // deprecated -- smx_context_t should die afterward
-  return process->get_impl()->context_;
-}
 /** @brief Add a function to the list of "on_exit" functions for the current process.
  *  The on_exit functions are the functions executed when your process is killed.
  *  You should use them to free the data used by your process.