X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3d4c51aace6f9daab7ee7bf664d9d56c81070f8..8cfd4f9b786027431b78a9b74db0843634ab7397:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index d352e3e2bb..3d637e466c 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -5,12 +5,16 @@ #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" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)"); -extern "C" { +std::string instr_pid(msg_process_t proc) +{ + return std::string(proc->get_cname()) + "-" + std::to_string(proc->get_pid()); +} /** @addtogroup m_process_management * @@ -36,11 +40,13 @@ void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor) msg_actor = (simgrid::msg::ActorExt*)SIMIX_process_self_get_data(); SIMIX_process_self_set_data(nullptr); } else { - msg_actor = (simgrid::msg::ActorExt*)smx_actor->userdata; + msg_actor = (simgrid::msg::ActorExt*)smx_actor->getUserData(); simcall_process_set_data(smx_actor, nullptr); } - TRACE_msg_process_destroy(smx_actor->ciface()); + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::by_name(instr_pid(smx_actor->ciface()))->remove_from_parent(); + // free the data if a function was provided if (msg_actor && msg_actor->data && msg_global->process_data_cleanup) { msg_global->process_data_cleanup(msg_actor->data); @@ -56,7 +62,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 @@ -139,7 +145,6 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun xbt_free(argv); return res; } -} msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, std::map* properties) @@ -153,13 +158,10 @@ msg_process_t MSG_process_create_from_stdfunc(const char* name, std::functionciface(); } -extern "C" { - /* Become a process in the simulation * * Currently this can only be called by the main thread (once) and only work with some thread factories @@ -179,10 +181,11 @@ msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, 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, new simgrid::msg::ActorExt(data), host->getCname(), &props, nullptr); + smx_actor_t process = + SIMIX_process_attach(name, new simgrid::msg::ActorExt(data), host->get_cname(), &props, nullptr); if (not process) xbt_die("Could not attach"); - simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process); + MSG_process_yield(); return process->ciface(); } @@ -197,46 +200,6 @@ void MSG_process_detach() SIMIX_process_detach(); } -/** \ingroup m_process_management - * \param process poor victim - * - * This function simply kills a \a process... scary isn't it ? :) - */ -void MSG_process_kill(msg_process_t process) -{ - process->kill(); -} - -/** -* \brief Wait for the completion of a #msg_process_t. -* -* \param process the process to wait for -* \param timeout wait until the process is over, or the timeout occurs -*/ -msg_error_t MSG_process_join(msg_process_t process, double timeout){ - process->join(timeout); - return MSG_OK; -} - -/** \ingroup m_process_management - * \brief Migrates a process to another location. - * - * This function checks whether \a process and \a host are valid pointers and change the value of the #msg_host_t on - * which \a process is running. - */ -msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host) -{ - TRACE_msg_process_change_host(process, host); - process->migrate(host); - return MSG_OK; -} - -/** Yield the current actor; let the other actors execute first */ -void MSG_process_yield() -{ - simgrid::simix::kernelImmediate([] { /* do nothing*/ }); -} - /** \ingroup m_process_management * \brief Returns the user data of a process. * @@ -247,7 +210,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()->getUserData(); if (msgExt) return msgExt->data; else @@ -263,7 +226,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()->getUserData())->data = data; return MSG_OK; } @@ -277,19 +240,6 @@ XBT_PUBLIC void MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) msg_global->process_data_cleanup = data_cleanup; } -/** \ingroup m_process_management - * - * \brief Return a #msg_process_t given its PID. - * - * This function search in the list of all the created msg_process_t for a msg_process_t whose PID is equal to \a PID. - * If no host is found, \c nullptr is returned. - Note that the PID are uniq in the whole simulation, not only on a given host. - */ -msg_process_t MSG_process_from_PID(int PID) -{ - return SIMIX_process_from_PID(PID)->ciface(); -} - /** @brief returns a list of all currently existing processes */ xbt_dynar_t MSG_processes_as_dynar() { xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t), nullptr); @@ -306,19 +256,6 @@ int MSG_process_get_number() return SIMIX_process_count(); } -/** \ingroup m_process_management - * \brief Set the kill time of a process. - * - * \param process a process - * \param kill_time the time when the process is killed. - */ -msg_error_t MSG_process_set_kill_time(msg_process_t process, double kill_time) -{ - process->setKillTime(kill_time); - return MSG_OK; -} - - /** \ingroup m_process_management * \brief Return the PID of the current process. * @@ -358,8 +295,8 @@ msg_process_t MSG_process_self() return SIMIX_process_self()->ciface(); } -smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { - return process->getImpl()->context; +smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { // deprecated -- smx_context_t should die afterward + return process->get_impl()->context; } /** * \ingroup m_process_management @@ -368,7 +305,7 @@ smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { * 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) { - simcall_process_on_exit(SIMIX_process_self(), fun, data); + simgrid::s4u::this_actor::on_exit(fun, data); } /** * \ingroup m_process_management @@ -377,7 +314,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 @@ -394,4 +331,3 @@ XBT_PUBLIC void MSG_process_unref(msg_process_t process) { intrusive_ptr_release(process); } -}