X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..82567f27fa74ddc2b6afa8d9b682bdde15fe3f9c:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 5c52d31e6c..9cdb6057f5 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -4,20 +4,19 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "msg_private.hpp" +#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) { - return std::string(proc->get_cname()) + "-" + std::to_string(proc->get_pid()); + return std::string(proc->get_name()) + "-" + std::to_string(proc->get_pid()); } /******************************** 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 @@ -68,66 +67,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(argv)); - std::unordered_map 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; + + try { + if (data != nullptr) { + actor = simgrid::s4u::Actor::init(std::move(name), host); + actor->extension()->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()); + } - smx_actor_t process = simcall_process_create(name, std::move(function), data, host, &props); + xbt_dict_free(&properties); for (int i = 0; i != argc; ++i) xbt_free(argv[i]); xbt_free(argv); - if (process == nullptr) - return nullptr; - - MSG_process_yield(); - return process->ciface(); -} - -/* Become a process in the simulation - * - * Currently this can only be called by the main thread (once) and only work with some thread factories - * (currently ThreadContextFactory). - * - * In the future, it might be extended in order to attach other threads created by a third party library. - */ -msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, xbt_dict_t properties) -{ - xbt_assert(host != nullptr, "Invalid parameters: host and code params must not be nullptr"); - std::unordered_map 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); - - /* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */ - smx_actor_t process = SIMIX_process_attach(name, data, host->get_cname(), &props, nullptr); - if (not process) - xbt_die("Could not attach"); - MSG_process_yield(); - return process->ciface(); -} - -/** @brief Detach a process attached with `MSG_process_attach()` - * - * This is called when the current process has finished its job. - * Used in the main thread, it waits for the simulation to finish before returning. When it returns, the other - * simulated processes and the maestro are destroyed. - */ -void MSG_process_detach() -{ - SIMIX_process_detach(); + simgrid::s4u::this_actor::yield(); + return actor.get(); } /** @brief Returns the user data of a process. @@ -139,7 +107,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. @@ -149,8 +117,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; } @@ -186,7 +153,7 @@ int MSG_process_get_number() int MSG_process_self_PID() { smx_actor_t self = SIMIX_process_self(); - return self == nullptr ? 0 : self->pid_; + return self == nullptr ? 0 : self->get_pid(); } /** @brief Return the PPID of the current process. @@ -214,14 +181,16 @@ msg_process_t MSG_process_self() } smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { // deprecated -- smx_context_t should die afterward - return process->get_impl()->context_; + return process->get_impl()->context_.get(); } /** @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_pvoid_pvoid_t fun, void *data) { - simgrid::s4u::this_actor::on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); +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 */