/* 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 "src/simix/smx_process_private.h"
-#include "src/simix/smx_private.h"
+#include "simgrid/s4u/host.hpp"
+#include "src/simix/ActorImpl.hpp"
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_process_t smx_proc)
+void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc)
{
simdata_process_t msg_proc;
msg_proc = (simdata_process_t) SIMIX_process_self_get_data();
SIMIX_process_self_set_data(nullptr);
} else {
- msg_proc = (simdata_process_t) simcall_process_get_data(smx_proc);
+ msg_proc = (simdata_process_t)smx_proc->data;
simcall_process_set_data(smx_proc, nullptr);
}
}
/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
-smx_process_t MSG_process_create_from_SIMIX(
- const char *name, std::function<void()> code, void *data, const char *hostname,
+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_process_t parent_process)
+ int auto_restart, smx_actor_t parent_process)
{
- msg_host_t host = MSG_host_by_name(hostname);
- msg_process_t p = MSG_process_create_with_environment(
- name, std::move(code), data, host, properties);
+ 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);
/* 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, sg_host_get_name(host), -1, properties, 0);
+ name, std::move(code), simdata, host, -1, properties, 0);
if (!process) {
/* Undo everything we have just changed */
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 = SIMIX_process_attach(name, simdata, sg_host_get_name(host), properties, nullptr);
+ process = SIMIX_process_attach(name, simdata, 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);
* Used in the main thread, it waits for the simulation to finish before returning. When it returns, the other
* simulated processes and the maestro are destroyed.
*/
-void MSG_process_detach(void)
+void MSG_process_detach()
{
SIMIX_process_detach();
}
*/
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_process_t simdata = (simdata_process_t)process->data;
simdata->m_host = host;
msg_host_t now = simdata->m_host;
TRACE_msg_process_change_host(process, now, 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);
+ simdata_process_t simdata = (simdata_process_t)process->data;
if (simdata)
return simdata->data;
else
{
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_process_t simdata = (simdata_process_t)process->data;
simdata->data = data;
return MSG_OK;
simdata = (simdata_process_t) SIMIX_process_self_get_data();
}
else {
- simdata = (simdata_process_t) simcall_process_get_data(process);
+ simdata = (simdata_process_t)process->data;
}
return simdata ? simdata->m_host : nullptr;
}
}
/** @brief returns a list of all currently existing processes */
-xbt_dynar_t MSG_processes_as_dynar(void) {
+xbt_dynar_t MSG_processes_as_dynar() {
return SIMIX_processes_as_dynar();
}
/** @brief Return the current number MSG processes. */
-int MSG_process_get_number(void)
+int MSG_process_get_number()
{
return SIMIX_process_count();
}
*
* This function returns the PID of the currently running #msg_process_t.
*/
-int MSG_process_self_PID(void)
+int MSG_process_self_PID()
{
return MSG_process_get_PID(MSG_process_self());
}
*
* This function returns the PID of the parent of the currently running #msg_process_t.
*/
-int MSG_process_self_PPID(void)
+int MSG_process_self_PPID()
{
return MSG_process_get_PPID(MSG_process_self());
}
*
* This function returns the currently running #msg_process_t.
*/
-msg_process_t MSG_process_self(void)
+msg_process_t MSG_process_self()
{
return SIMIX_process_self();
}