XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
+SG_BEGIN_DECL()
+
/** @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)
{
- MsgActorExt* msg_actor;
+ simgrid::MsgActorExt* 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 = (MsgActorExt*)SIMIX_process_self_get_data();
+ msg_actor = (simgrid::MsgActorExt*)SIMIX_process_self_get_data();
SIMIX_process_self_set_data(nullptr);
} else {
- msg_actor = (MsgActorExt*)smx_actor->data;
+ msg_actor = (simgrid::MsgActorExt*)smx_actor->data;
simcall_process_set_data(smx_actor, nullptr);
}
msg_global->process_data_cleanup(msg_actor->data);
}
- // free the MSG process
- xbt_free(msg_actor);
+ 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,
- double kill_time, xbt_dict_t properties,
- int auto_restart, smx_actor_t parent_process)
+smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data, sg_host_t host,
+ xbt_dict_t properties, smx_actor_t parent_process)
{
- msg_process_t p = MSG_process_create_with_environment(name, std::move(code), data, host, properties);
- if (p) {
- MSG_process_set_kill_time(p,kill_time);
- MSG_process_auto_restart_set(p,auto_restart);
- }
+ msg_process_t p = MSG_process_create_from_stdfunc(name, std::move(code), data, host, properties);
return p;
}
std::function<void()> function;
if (code)
function = simgrid::xbt::wrapMain(code, argc, const_cast<const char*const*>(argv));
- msg_process_t res = MSG_process_create_with_environment(name,
- std::move(function), data, host, properties);
+ msg_process_t res = MSG_process_create_from_stdfunc(name, std::move(function), data, host, properties);
for (int i = 0; i != argc; ++i)
xbt_free(argv[i]);
xbt_free(argv);
return res;
}
-msg_process_t MSG_process_create_with_environment(
- const char *name, std::function<void()> code, void *data,
- msg_host_t host, xbt_dict_t properties)
+SG_END_DECL()
+
+msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function<void()> code, void* data, msg_host_t host,
+ xbt_dict_t properties)
{
xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr");
- MsgActorExt* simdata = new MsgActorExt();
+ simgrid::MsgActorExt* msgExt = new simgrid::MsgActorExt(data);
- /* Simulator data for MSG */
- simdata->m_host = host;
- simdata->data = data;
+ msg_process_t process = simcall_process_create(name, std::move(code), msgExt, host, properties);
- /* Let's create the process: SIMIX may decide to start it right now,
- * even before returning the flow control to us */
- msg_process_t process = simcall_process_create(name, std::move(code), simdata, host, -1, properties, 0);
-
- if (!process) {
- /* Undo everything we have just changed */
- xbt_free(simdata);
+ if (!process) { /* Undo everything */
+ delete msgExt;
return nullptr;
}
- else {
- simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
- }
+
+ simcall_process_on_exit(process, (int_f_pvoid_pvoid_t)TRACE_msg_process_kill, process);
return process;
}
+SG_BEGIN_DECL()
+
/* Become a process in the simulation
*
* Currently this can only be called by the main thread (once) and only work with some thread factories
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");
- MsgActorExt* msgExt = new MsgActorExt();
-
- /* Simulator data for MSG */
- msgExt->m_host = host;
- msgExt->data = data;
/* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
- msg_process_t process = SIMIX_process_attach(name, msgExt, host->cname(), properties, nullptr);
+ msg_process_t process =
+ SIMIX_process_attach(name, new simgrid::MsgActorExt(data), host->cname(), properties, nullptr);
if (!process)
xbt_die("Could not attach");
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
*/
msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
{
- MsgActorExt* msgExt = (MsgActorExt*)process->data;
- msgExt->m_host = host;
- msg_host_t now = msgExt->m_host;
- TRACE_msg_process_change_host(process, now, host);
+ TRACE_msg_process_change_host(process, MSG_process_get_host(process), host);
simcall_process_set_host(process, host);
return MSG_OK;
}
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
/* get from SIMIX the MSG process data, and then the user data */
- MsgActorExt* msgExt = (MsgActorExt*)process->data;
+ simgrid::MsgActorExt* msgExt = (simgrid::MsgActorExt*)process->data;
if (msgExt)
return msgExt->data;
else
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
- MsgActorExt* msgExt = (MsgActorExt*)process->data;
- msgExt->data = data;
+ static_cast<simgrid::MsgActorExt*>(process->data)->data = data;
return MSG_OK;
}
*/
msg_host_t MSG_process_get_host(msg_process_t process)
{
- MsgActorExt* msgExt;
if (process == nullptr) {
- msgExt = (MsgActorExt*)SIMIX_process_self_get_data();
- }
- else {
- msgExt = (MsgActorExt*)process->data;
+ return MSG_process_self()->host;
+ } else {
+ return process->host;
}
- return msgExt ? msgExt->m_host : nullptr;
}
/** \ingroup m_process_management
XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process) {
return simcall_process_restart(process);
}
+
+SG_END_DECL()
