From c630e592bf768a21557ad91fd626ea5943449152 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 7 Mar 2019 16:55:15 +0100 Subject: [PATCH] use extension for user data in MSG --- include/simgrid/s4u/Actor.hpp | 2 ++ src/msg/msg_global.cpp | 11 ++++++++++- src/msg/msg_private.hpp | 14 ++++++++++++++ src/msg/msg_process.cpp | 19 +++++++------------ src/s4u/s4u_Actor.cpp | 10 ++++++++++ 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 905189049b..d1b68c70d6 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -169,6 +169,8 @@ public: * If the actor is restarted, the actor has a fresh copy of the function. */ static ActorPtr create(std::string name, s4u::Host* host, std::function code); + static ActorPtr init(std::string name, s4u::Host* host); + ActorPtr start(std::function code); /** Create an actor from a std::function * diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index ede87a5098..6f5885ad5d 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -15,6 +15,8 @@ XBT_LOG_NEW_CATEGORY(msg, "All MSG categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)"); MSG_Global_t msg_global = nullptr; +simgrid::xbt::Extension simgrid::msg::ActorUserData::EXTENSION_ID; + static void MSG_exit(); /********************************* MSG **************************************/ @@ -31,6 +33,8 @@ void MSG_init_nocheck(int *argc, char **argv) { if (not msg_global) { msg_global = new s_MSG_Global_t(); + if (not simgrid::msg::ActorUserData::EXTENSION_ID.valid()) + simgrid::msg::ActorUserData::EXTENSION_ID = simgrid::s4u::Actor::extension_create(); msg_global->debug_multiple_use = false; simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use", @@ -42,9 +46,14 @@ void MSG_init_nocheck(int *argc, char **argv) { msg_global->task_copy_callback = nullptr; msg_global->process_data_cleanup = nullptr; + simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::ActorPtr actor) { + XBT_DEBUG("creating the extension to store user data"); + actor->extension_set(new simgrid::msg::ActorUserData(actor)); + }); + simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) { // free the data if a function was provided - void* userdata = actor->get_impl()->get_user_data(); + void* userdata = actor->extension()->get_user_data(); if (userdata && msg_global->process_data_cleanup) { msg_global->process_data_cleanup(userdata); } diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 3dbb000138..652df4ead9 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -97,6 +97,20 @@ public: } }; +class ActorUserData { + void* userdata_ = nullptr; + s4u::ActorPtr actor_ = nullptr; + +public: + static xbt::Extension EXTENSION_ID; + + explicit ActorUserData(s4u::ActorPtr ptr) : actor_(ptr) {} + ~ActorUserData() = default; + + void set_user_data(void* data) { userdata_ = data; } + void* get_user_data() { return userdata_; } +}; + } // namespace msg } // namespace simgrid diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index d95e2db3c4..7bec1eca94 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -18,7 +18,6 @@ std::string instr_pid(msg_process_t proc) } /******************************** 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,7 +68,6 @@ 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(argv)); @@ -82,13 +80,11 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun props[key] = value; xbt_dict_free(&properties); - smx_actor_t self = SIMIX_process_self(); - smx_actor_t actor = nullptr; + simgrid::s4u::ActorPtr 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(); - }); + actor = simgrid::s4u::Actor::init(std::move(name), host); + actor->extension()->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()); } @@ -101,7 +97,7 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun return nullptr; MSG_process_yield(); - return actor->ciface(); + return actor.get(); } /** @brief Returns the user data of a process. @@ -113,7 +109,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()->get_user_data(); } /** @brief Sets the user data of a process. @@ -123,8 +119,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()->set_user_data(data); return MSG_OK; } diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 1d719e04b3..f31600a392 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -39,6 +39,16 @@ ActorPtr Actor::self() return self_context->get_actor()->iface(); } +ActorPtr Actor::init(std::string name, s4u::Host* host) +{ + return SIMIX_process_self()->init(std::move(name), host)->iface(); +} + +ActorPtr Actor::start(std::function code) +{ + simgrid::simix::simcall([this, code] { return this->get_impl()->start(code); }); + return this; +} ActorPtr Actor::create(std::string name, s4u::Host* host, std::function code) { -- 2.20.1