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());
+}
+
+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 ************************************/
if (code)
function = simgrid::xbt::wrap_main(code, argc, static_cast<const char* const*>(argv));
- 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)
- actor->set_property(key, value);
- xbt_dict_free(&properties);
+ simgrid::s4u::ActorPtr actor;
try {
- actor->start(std::move(function));
+ 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 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);
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.