/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <functional>
-
#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/functional.hpp"
+#include "simgrid/s4u/host.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
* \brief Cleans the MSG data of a process.
* \param smx_proc a SIMIX process
*/
-void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc)
+void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor)
{
- simdata_process_t msg_proc;
+ MsgActorExt* msg_actor;
// get the MSG process from the SIMIX process
- if (smx_proc == SIMIX_process_self()) {
+ if (smx_actor == SIMIX_process_self()) {
/* avoid a SIMIX request if this function is called by the process itself */
- msg_proc = (simdata_process_t) SIMIX_process_self_get_data();
+ msg_actor = (MsgActorExt*)SIMIX_process_self_get_data();
SIMIX_process_self_set_data(nullptr);
} else {
- msg_proc = (simdata_process_t) simcall_process_get_data(smx_proc);
- simcall_process_set_data(smx_proc, nullptr);
+ msg_actor = (MsgActorExt*)smx_actor->data;
+ simcall_process_set_data(smx_actor, nullptr);
}
- TRACE_msg_process_destroy(smx_proc->name.c_str(), smx_proc->pid);
+ TRACE_msg_process_destroy(smx_actor->name.c_str(), smx_actor->pid);
// free the data if a function was provided
- if (msg_proc && msg_proc->data && msg_global->process_data_cleanup) {
- msg_global->process_data_cleanup(msg_proc->data);
+ if (msg_actor && msg_actor->data && msg_global->process_data_cleanup) {
+ msg_global->process_data_cleanup(msg_actor->data);
}
// free the MSG process
- xbt_free(msg_proc);
- SIMIX_process_cleanup(smx_proc);
+ xbt_free(msg_actor);
+ SIMIX_process_cleanup(smx_actor);
}
/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
msg_host_t host, xbt_dict_t properties)
{
xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr");
- simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
- msg_process_t process;
+ MsgActorExt* simdata = new MsgActorExt();
/* Simulator data for MSG */
- simdata->waiting_action = nullptr;
- simdata->waiting_task = nullptr;
simdata->m_host = host;
simdata->data = data;
simdata->last_errno = MSG_OK;
/* Let's create the process: SIMIX may decide to start it right now,
* even before returning the flow control to us */
- process = simcall_process_create(
- name, std::move(code), simdata, host, -1, properties, 0);
+ msg_process_t process = simcall_process_create(name, std::move(code), simdata, host, -1, properties, 0);
if (!process) {
/* Undo everything we have just changed */
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");
- simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
- msg_process_t process;
+ MsgActorExt* msgExt = new MsgActorExt();
/* Simulator data for MSG */
- simdata->waiting_action = nullptr;
- simdata->waiting_task = nullptr;
- simdata->m_host = host;
- simdata->data = data;
- simdata->last_errno = MSG_OK;
+ 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 */
- process = SIMIX_process_attach(name, simdata, host->cname(), properties, nullptr);
+ msg_process_t process = SIMIX_process_attach(name, msgExt, 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);
*/
void MSG_process_kill(msg_process_t process)
{
-// /* FIXME: why do we only cancel communication actions? is this useful? */
-// simdata_process_t p_simdata = simcall_process_get_data(process);
-// if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) {
-// simcall_comm_cancel(p_simdata->waiting_task->simdata->comm);
-// }
simcall_process_kill(process);
}
*/
msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
{
- simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process);
- simdata->m_host = host;
- msg_host_t now = simdata->m_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);
simcall_process_set_host(process, 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.
*
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
/* get from SIMIX the MSG process data, and then the user data */
- simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process);
- if (simdata)
- return simdata->data;
+ MsgActorExt* msgExt = (MsgActorExt*)process->data;
+ if (msgExt)
+ return msgExt->data;
else
return nullptr;
}
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
- simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process);
- simdata->data = data;
+ MsgActorExt* msgExt = (MsgActorExt*)process->data;
+ msgExt->data = data;
return MSG_OK;
}
*/
msg_host_t MSG_process_get_host(msg_process_t process)
{
- simdata_process_t simdata;
+ MsgActorExt* msgExt;
if (process == nullptr) {
- simdata = (simdata_process_t) SIMIX_process_self_get_data();
+ msgExt = (MsgActorExt*)SIMIX_process_self_get_data();
}
else {
- simdata = (simdata_process_t) simcall_process_get_data(process);
+ msgExt = (MsgActorExt*)process->data;
}
- return simdata ? simdata->m_host : nullptr;
+ return msgExt ? msgExt->m_host : nullptr;
}
/** \ingroup m_process_management
