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();
-
- /* Simulator data for MSG */
- simdata->m_host = host;
- simdata->data = data;
- simdata->last_errno = MSG_OK;
+ MsgActorExt* msgExt = new MsgActorExt(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 = simcall_process_create(name, std::move(code), simdata, host, -1, properties, 0);
+ msg_process_t process = simcall_process_create(name, std::move(code), msgExt, host, -1, properties, 0);
- if (!process) {
- /* Undo everything we have just changed */
- xbt_free(simdata);
+ if (!process) { /* Undo everything */
+ delete msgExt;
return nullptr;
}
else {
return process;
}
-static int MSG_maestro(int argc, char** argv)
-{
- int res = MSG_main();
- return res;
-}
-
/* 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 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;
}
*/
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