X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d02714ee138a3bd9b02e0064b7a2aa26407e9e8..16f1630ae434e729cbe0b24fe2f19c8f67f774cd:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index d95e2db3c4..e790079093 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -7,18 +7,16 @@ #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) +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()); } /******************************** 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,64 +67,29 @@ 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"); + sg_actor_t actor = sg_actor_init(std::move(name), host); - 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); - - smx_actor_t self = SIMIX_process_self(); - smx_actor_t 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(); - }); + if (data != nullptr) { + 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); + } + sg_actor_start(actor, code, argc, argv); } catch (simgrid::HostFailureException const&) { - xbt_die("Could not create a new process on failed host %s.", host->get_cname()); + 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); - if (actor == nullptr) - return nullptr; - - MSG_process_yield(); - return actor->ciface(); -} - -/** @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->get_impl()->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->get_impl()->set_user_data(data); - - return MSG_OK; + simgrid::s4u::this_actor::yield(); + return actor; } /** @brief Sets a cleanup function to be called to free the userdata of a process when a process is destroyed. @@ -147,66 +110,11 @@ xbt_dynar_t MSG_processes_as_dynar() { return res; } -/** @brief Return the current number MSG processes. */ -int MSG_process_get_number() -{ - return SIMIX_process_count(); -} - -/** @brief Return the PID of the current process. - * - * This function returns the PID of the currently running #msg_process_t. - */ -int MSG_process_self_PID() -{ - smx_actor_t self = SIMIX_process_self(); - return self == nullptr ? 0 : self->get_pid(); -} - -/** @brief Return the PPID of the current process. - * - * This function returns the PID of the parent of the currently running #msg_process_t. - */ -int MSG_process_self_PPID() -{ - return MSG_process_get_PPID(MSG_process_self()); -} - -/** @brief Return the name of the current process. */ -const char* MSG_process_self_name() -{ - return SIMIX_process_self_get_name(); -} - -/** @brief Return the current process. - * - * This function returns the currently running #msg_process_t. - */ -msg_process_t MSG_process_self() -{ - 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. */ 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); }); }