X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9caf173e476622d309cc5653a83d224d05787cc7..84733adf13f6e36f5861ddd1953e4df97ef2be78:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 433e487cb9..ce9f382795 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -5,6 +5,7 @@ #include "msg_private.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/instr/instr_private.hpp" #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.hpp" @@ -56,7 +57,7 @@ smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::functiongetImpl(); + return p == nullptr ? nullptr : p->get_impl(); } /** \ingroup m_process_management @@ -211,7 +212,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 */ - simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->getImpl()->userdata; + simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->get_impl()->userdata; if (msgExt) return msgExt->data; else @@ -227,7 +228,7 @@ 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!"); - static_cast(process->getImpl()->userdata)->data = data; + static_cast(process->get_impl()->userdata)->data = data; return MSG_OK; } @@ -310,7 +311,7 @@ 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->getImpl()->context; + return process->get_impl()->context; } /** * \ingroup m_process_management @@ -328,7 +329,7 @@ void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data) { */ XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_restart) { - process->setAutoRestart(auto_restart); + process->set_auto_restart(auto_restart); } /** @ingroup m_process_management