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.
*
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) {
- 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);
- 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());
}
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.
return res;
}
-/** @brief Return the current number MSG processes. */
-int MSG_process_get_number()
-{
- return SIMIX_process_count();
-}
-
/** @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.
*/
void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data)
{
- simgrid::s4u::this_actor::on_exit(
- [fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); });
-}
-
-/** @brief Take an extra reference on that process to prevent it to be garbage-collected */
-XBT_PUBLIC void MSG_process_ref(msg_process_t process)
-{
- intrusive_ptr_add_ref(process);
-}
-/** @brief Release a reference on that process so that it can get be garbage-collected */
-XBT_PUBLIC void MSG_process_unref(msg_process_t process)
-{
- intrusive_ptr_release(process);
+ simgrid::s4u::this_actor::on_exit([fun, data](bool failed) { fun(failed ? 1 /*FAILURE*/ : 0 /*SUCCESS*/, data); });
}
