simplify user data management in MSG

The recently introduced generic extension for user data make the
specific management made in MSG redudant. MSG_process_get_data and
MSG_process_set_data are now mapped on the sg_actor_data_set and
sg_actor_data functions and have been moved to msg_legacy.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index e061e0c..20b55df 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -17,7 +17,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kerne
 bool MSG_Global_t::debug_multiple_use = false;
 
 MSG_Global_t* msg_global = nullptr;
 bool MSG_Global_t::debug_multiple_use = false;
 
 MSG_Global_t* msg_global = nullptr;

-simgrid::xbt::Extension<simgrid::s4u::Actor, simgrid::msg::ActorUserData> simgrid::msg::ActorUserData::EXTENSION_ID;

 
 static void MSG_exit();
 
 
 static void MSG_exit();
 


@@ -43,7 +42,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
     msg_global->sent_msg = 0;
     msg_global->task_copy_callback = nullptr;
     msg_global->process_data_cleanup = nullptr;
     msg_global->sent_msg = 0;
     msg_global->task_copy_callback = nullptr;
     msg_global->process_data_cleanup = nullptr;

-    MSG_process_userdata_init();

   }
 
   if(MC_is_active()){
   }
 
   if(MC_is_active()){

diff --git a/src/msg/msg_legacy.cpp b/src/msg/msg_legacy.cpp
index 344a8f9..105105f 100644 (file)
--- a/src/msg/msg_legacy.cpp
+++ b/src/msg/msg_legacy.cpp
@@ -135,6 +135,30 @@ msg_error_t MSG_process_sleep(double duration)
   }
 }
 
   }
 }
 

+/** @brief Returns the user data of a process.
+ *
+ * This function checks whether @a process is a valid pointer and returns the user data associated to this process.
+ */
+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 sg_actor_data(process);
+}
+
+/** @brief Sets the user data of a process.
+ *
+ * This function checks whether @a process is a valid pointer and sets the user data associated to this 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!");
+  sg_actor_data_set(process, data);
+
+  return MSG_OK;
+}
+

 msg_process_t MSG_process_attach(const char* name, void* data, msg_host_t host, xbt_dict_t properties)
 {
   return sg_actor_attach(name, data, host, properties);
 msg_process_t MSG_process_attach(const char* name, void* data, msg_host_t host, xbt_dict_t properties)
 {
   return sg_actor_attach(name, data, host, properties);

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index 35c3ee5..8b0378e 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -101,16 +101,6 @@ public:
   msg_error_t get_status() { return status_; }
 };
 
   msg_error_t get_status() { return status_; }
 };
 

-class ActorUserData {
-  void* userdata_      = nullptr;
-
-public:
-  static xbt::Extension<simgrid::s4u::Actor, ActorUserData> EXTENSION_ID;
-
-  void set_user_data(void* data) { userdata_ = data; }
-  void* get_user_data() { return userdata_; }
-};
-

 } // namespace msg
 } // namespace simgrid
 
 } // namespace msg
 } // namespace simgrid
 

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index 3eb4648..7ecfd44 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -16,28 +16,6 @@ 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());
 }
 

-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.
  *
 /******************************** Process ************************************/
 /** @brief Creates and runs a new #msg_process_t.
  *


@@ -89,24 +67,18 @@ 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");
                                                   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));
-
-  simgrid::s4u::ActorPtr actor;
+  sg_actor_t actor = sg_actor_init(std::move(name), host);

 
   try {
     if (data != nullptr) {
 
   try {
     if (data != nullptr) {

-      actor = simgrid::s4u::Actor::init(std::move(name), host);
-      actor->extension<simgrid::msg::ActorUserData>()->set_user_data(data);
+      sg_actor_data_set(actor, data);

       xbt_dict_cursor_t cursor = nullptr;
       char* key;
       char* value;
       xbt_dict_foreach (properties, cursor, key, value)
         actor->set_property(key, value);
       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));
+    }
+    sg_actor_start(actor, code, argc, argv);

   } catch (simgrid::HostFailureException const&) {
     xbt_die("Could not launch a new process on failed host %s.", host->get_cname());
   }
   } catch (simgrid::HostFailureException const&) {
     xbt_die("Could not launch a new process on failed host %s.", host->get_cname());
   }


@@ -117,31 +89,7 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun
   xbt_free(argv);
 
   simgrid::s4u::this_actor::yield();
   xbt_free(argv);
 
   simgrid::s4u::this_actor::yield();

-  return actor.get();
-}
-
-/** @brief Returns the user data of a process.
- *
- * This function checks whether @a process is a valid pointer and returns the user data associated to this process.
- */
-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->extension<simgrid::msg::ActorUserData>()->get_user_data();
-}
-
-/** @brief Sets the user data of a process.
- *
- * This function checks whether @a process is a valid pointer and sets the user data associated to this 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->extension<simgrid::msg::ActorUserData>()->set_user_data(data);
-
-  return MSG_OK;
+  return actor;

 }
 
 /** @brief Sets a cleanup function to be called to free the userdata of a process when a process is destroyed.
 }
 
 /** @brief Sets a cleanup function to be called to free the userdata of a process when a process is destroyed.