#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" {
-
/** @addtogroup m_process_management
*
* Processes (#msg_process_t) are independent agents that can do stuff on their own. They are in charge of executing
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);
}
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
xbt_free(argv);
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)
return nullptr;
}
- simcall_process_on_exit(process, (int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process);
+ process->ciface()->on_exit((int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process);
return process->ciface();
}
-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
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);
+ process->ciface()->on_exit((int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process);
return process->ciface();
}
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;
-}
-
/** Yield the current actor; let the other actors execute first */
void MSG_process_yield()
{
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
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
- static_cast<simgrid::msg::ActorExt*>(process->getImpl()->userdata)->data = data;
+ static_cast<simgrid::msg::ActorExt*>(process->get_impl()->getUserData())->data = data;
return MSG_OK;
}
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.
*
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
* 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
*/
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
{
intrusive_ptr_release(process);
}
-}
