#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)");
+std::string instr_pid(msg_process_t proc)
+{
+ return std::string(proc->get_cname()) + "-" + std::to_string(proc->get_pid());
+}
+
/** @addtogroup m_process_management
*
* Processes (#msg_process_t) are independent agents that can do stuff on their own. They are in charge of executing
*/
void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor)
{
- simgrid::msg::ActorExt* msg_actor;
-
- // get the MSG process from the SIMIX process
- if (smx_actor == SIMIX_process_self()) {
- /* avoid a SIMIX request if this function is called by the process itself */
- 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;
- simcall_process_set_data(smx_actor, nullptr);
- }
-
if (TRACE_actor_is_enabled())
- simgrid::instr::Container::byName(instr_pid(smx_actor->ciface()))->removeFromParent();
+ 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);
+ void* userdata = smx_actor->get_user_data();
+ if (userdata && msg_global->process_data_cleanup) {
+ msg_global->process_data_cleanup(userdata);
}
- delete msg_actor;
SIMIX_process_cleanup(smx_actor);
}
/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
-smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data, sg_host_t host,
- std::map<std::string, std::string>* properties,
+smx_actor_t MSG_process_create_from_SIMIX(std::string name, simgrid::simix::ActorCode code, void* data, sg_host_t host,
+ std::unordered_map<std::string, std::string>* properties,
smx_actor_t /*parent_process*/)
{
msg_process_t p = MSG_process_create_from_stdfunc(name, std::move(code), data, host, properties);
- return p == nullptr ? nullptr : p->getImpl();
+ return p == nullptr ? nullptr : p->get_impl();
}
/** \ingroup m_process_management
*/
msg_process_t MSG_process_create(const char *name, xbt_main_func_t code, void *data, msg_host_t host)
{
- return MSG_process_create_with_environment(name, code, data, host, 0, nullptr, nullptr);
+ return MSG_process_create_with_environment(name == nullptr ? "" : name, code, data, host, 0, nullptr, nullptr);
}
/** \ingroup m_process_management
msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_func_t code, void *data, msg_host_t host,
int argc, char **argv, xbt_dict_t properties)
{
- std::function<void()> function;
+ simgrid::simix::ActorCode function;
if (code)
- function = simgrid::xbt::wrapMain(code, argc, static_cast<const char* const*>(argv));
+ function = simgrid::xbt::wrap_main(code, argc, static_cast<const char* const*>(argv));
- std::map<std::string, std::string> props;
+ std::unordered_map<std::string, std::string> props;
xbt_dict_cursor_t cursor = nullptr;
char* key;
char* value;
return res;
}
-msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function<void()> code, void* data, msg_host_t host,
- std::map<std::string, std::string>* properties)
+msg_process_t MSG_process_create_from_stdfunc(std::string name, simgrid::simix::ActorCode code, void* data,
+ msg_host_t host, std::unordered_map<std::string, std::string>* properties)
{
xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr");
- simgrid::msg::ActorExt* msgExt = new simgrid::msg::ActorExt(data);
- smx_actor_t process = simcall_process_create(name, std::move(code), msgExt, host, properties);
+ smx_actor_t process = simcall_process_create(name, std::move(code), data, host, properties);
- if (not process) { /* Undo everything */
- delete msgExt;
+ if (process == nullptr)
return nullptr;
- }
- simcall_process_on_exit(process, (int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process);
+ MSG_process_yield();
return process->ciface();
}
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::map<std::string, std::string> props;
+ std::unordered_map<std::string, std::string> props;
xbt_dict_cursor_t cursor = nullptr;
char* key;
char* 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, new simgrid::msg::ActorExt(data), host->get_cname(), &props, nullptr);
+ smx_actor_t process = SIMIX_process_attach(name, 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();
}
SIMIX_process_detach();
}
-/** 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.
*
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;
- if (msgExt)
- return msgExt->data;
- else
- return nullptr;
+ return process->get_impl()->get_user_data();
}
/** \ingroup m_process_management
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
- static_cast<simgrid::msg::ActorExt*>(process->getImpl()->userdata)->data = data;
+ process->get_impl()->set_user_data(data);
return MSG_OK;
}
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);
int MSG_process_self_PID()
{
smx_actor_t self = SIMIX_process_self();
- return self == nullptr ? 0 : self->pid;
+ return self == nullptr ? 0 : self->pid_;
}
/** \ingroup m_process_management
}
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
* 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);
-}
-/**
- * \ingroup m_process_management
- * \brief Sets the "auto-restart" flag of the process.
- * If the flag is set to 1, the process will be automatically restarted when its host comes back up.
- */
-XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_restart)
-{
- process->setAutoRestart(auto_restart);
+ simgrid::s4u::this_actor::on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
}
/** @ingroup m_process_management
