#include "xbt/dict.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
-#include "src/mc/mc_client.h"
-#include "src/simix/smx_private.hpp"
+#include "src/mc/Client.hpp"
#include "src/msg/msg_private.h"
+#include "src/simix/SynchroSleep.hpp"
+#include "src/simix/SynchroRaw.hpp"
+#include "src/simix/SynchroIo.hpp"
+
#ifdef HAVE_SMPI
#include "src/smpi/private.h"
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
- "Logging specific to SIMIX (process)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
unsigned long simix_process_maxpid = 0;
{
smx_context_t self_context = SIMIX_context_self();
- return self_context ? SIMIX_context_get_process(self_context) : NULL;
+ return self_context ? self_context->process() : NULL;
}
/**
/* cancel non-blocking communications */
smx_synchro_t synchro;
while ((synchro = (smx_synchro_t) xbt_fifo_pop(process->comms))) {
+ simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
/* make sure no one will finish the comm after this process is destroyed,
* because src_proc or dst_proc would be an invalid pointer */
- SIMIX_comm_cancel(synchro);
+ comm->cancel();
- if (synchro->comm.src_proc == process) {
+ if (comm->src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
- synchro, synchro->comm.detached, (int)synchro->state, synchro->comm.src_proc, synchro->comm.dst_proc);
- synchro->comm.src_proc = NULL;
+ comm, comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc);
+ comm->src_proc = NULL;
/* I'm not supposed to destroy a detached comm from the sender side, */
- if (!synchro->comm.detached)
- SIMIX_comm_destroy(synchro);
+ if (comm->detached)
+ XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender");
else
- XBT_DEBUG("Don't destroy it since it's a detached comm");
+ comm->unref();
}
- else if (synchro->comm.dst_proc == process){
+ else if (comm->dst_proc == process){
XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p",
- synchro, (int)synchro->state, synchro->comm.src_proc, synchro->comm.dst_proc);
- synchro->comm.dst_proc = NULL;
+ comm, (int)comm->state, comm->src_proc, comm->dst_proc);
+ comm->dst_proc = NULL;
- if (synchro->comm.detached && synchro->comm.refcount == 1
- && synchro->comm.src_proc != NULL) {
+ if (comm->detached && comm->src_proc != NULL) {
/* the comm will be freed right now, remove it from the sender */
- xbt_fifo_remove(synchro->comm.src_proc->comms, synchro);
+ xbt_fifo_remove(comm->src_proc->comms, comm);
}
- SIMIX_comm_destroy(synchro);
- }
- else {
- xbt_die("Communication synchro %p is in my list but I'm not the sender "
- "or the receiver", synchro);
+
+ comm->unref();
+ } else {
+ xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
}
}
XBT_DEBUG("%p should not be run anymore",process);
xbt_swag_remove(process, simix_global->process_list);
- xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
+ if (process->host)
+ xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
xbt_swag_insert(process, simix_global->process_to_destroy);
process->context->iwannadie = 0;
while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) {
XBT_DEBUG("Getting rid of %p",process);
- SIMIX_context_free(process->context);
+ delete process->context;
/* Free the exception allocated at creation time */
free(process->running_ctx);
xbt_dynar_free(&process->on_exit);
xbt_free(process->name);
- xbt_free(process);
+ delete process;
}
}
-/**
- * \brief Creates and runs the maestro process
- */
-void SIMIX_create_maestro_process()
+namespace simgrid {
+namespace simix {
+
+void create_maestro(std::function<void()> code)
{
smx_process_t maestro = NULL;
-
/* Create maestro process and intilialize it */
- maestro = xbt_new0(s_smx_process_t, 1);
+ maestro = new simgrid::simix::Process();
maestro->pid = simix_process_maxpid++;
maestro->ppid = -1;
- maestro->name = (char *) "";
+ maestro->name = (char*) "";
+ maestro->data = nullptr;
maestro->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
- maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro);
+
+ if (!code) {
+ maestro->context = SIMIX_context_new(std::function<void()>(), NULL, maestro);
+ } else {
+ if (!simix_global)
+ xbt_die("simix is not initialized, please call MSG_init first");
+ maestro->context =
+ simix_global->context_factory->create_maestro(code, maestro);
+ }
+
maestro->simcall.issuer = maestro;
simix_global->maestro_process = maestro;
- return;
}
+
+}
+}
+
+/**
+ * \brief Creates and runs the maestro process
+ */
+void SIMIX_maestro_create(void (*code)(void*), void* data)
+{
+ simgrid::simix::create_maestro(std::bind(code, data));
+}
+
/**
* \brief Stops a process.
*
/* execute the on_exit functions */
SIMIX_process_on_exit_runall(arg);
/* Add the process to the list of process to restart, only if the host is down */
- if (arg->auto_restart && arg->host->is_off()) {
+ if (arg->auto_restart && arg->host->isOff()) {
SIMIX_host_add_auto_restart_process(arg->host,arg->name,arg->code, arg->data,
sg_host_get_name(arg->host),
SIMIX_timer_get_date(arg->kill_timer),
arg->auto_restart);
}
XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host));
- /* stop the context */
- SIMIX_context_stop(arg->context);
-}
-
-/**
- * \brief Same as SIMIX_process_create() but with only one argument (used by timers).
- * This function frees the argument.
- * \return the process created
- */
-smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
-
- smx_process_t process = simix_global->create_process_function(
- args->name,
- args->code,
- args->data,
- args->hostname,
- args->kill_time,
- args->argc,
- args->argv,
- args->properties,
- args->auto_restart,
- NULL);
- xbt_free(args);
- return process;
+ arg->context->stop();
}
-
void* simcall_HANDLER_process_create(smx_simcall_t simcall,
const char *name,
xbt_main_func_t code,
XBT_DEBUG("Start process %s on host '%s'", name, hostname);
- if (host->is_off()) {
+ if (host->isOff()) {
int i;
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
hostname);
xbt_free(argv);
}
else {
- process = xbt_new0(s_smx_process_t, 1);
+ process = new simgrid::simix::Process();
xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
/* Process data */
process->ppid = SIMIX_process_get_PID(parent_process);
/* SMPI process have their own data segment and
each other inherit from their father */
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if(smpi_privatize_global_variables){
if( parent_process->pid != 0){
SIMIX_segment_index_set(process, parent_process->segment_index);
XBT_VERB("Create context %s", process->name);
- process->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, process);
+ process->context = SIMIX_context_new(
+ simgrid::simix::wrap_main(code, argc, argv),
+ simix_global->cleanup_process_function, process);
process->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
XBT_RUNNING_CTX_INITIALIZE(process->running_ctx);
return process;
}
+smx_process_t SIMIX_process_attach(
+ const char* name,
+ void *data,
+ const char* hostname,
+ xbt_dict_t properties,
+ smx_process_t parent_process)
+{
+ // This is mostly a copy/paste from SIMIX_process_new(),
+ // it'd be nice to share some code between those two functions.
+
+ sg_host_t host = sg_host_by_name(hostname);
+ XBT_DEBUG("Attach process %s on host '%s'", name, hostname);
+
+ if (host->isOff()) {
+ XBT_WARN("Cannot launch process '%s' on failed host '%s'",
+ name, hostname);
+ return nullptr;
+ }
+
+ smx_process_t process = new simgrid::simix::Process();
+ /* Process data */
+ process->pid = simix_process_maxpid++;
+ process->name = xbt_strdup(name);
+ process->host = host;
+ process->data = data;
+ process->comms = xbt_fifo_new();
+ process->simcall.issuer = process;
+ process->ppid = -1;
+ /* Initiliaze data segment to default value */
+ SIMIX_segment_index_set(process, -1);
+ if (parent_process != NULL) {
+ process->ppid = SIMIX_process_get_PID(parent_process);
+ /* SMPI process have their own data segment and
+ each other inherit from their father */
+ #if HAVE_SMPI
+ if(smpi_privatize_global_variables){
+ if(parent_process->pid != 0){
+ SIMIX_segment_index_set(process, parent_process->segment_index);
+ } else {
+ SIMIX_segment_index_set(process, process->pid - 1);
+ }
+ }
+ #endif
+ }
+
+ /* Process data for auto-restart */
+ process->auto_restart = false;
+ process->code = nullptr;
+ process->argc = 0;
+ process->argv = nullptr;
+
+ XBT_VERB("Create context %s", process->name);
+ if (!simix_global)
+ xbt_die("simix is not initialized, please call MSG_init first");
+ process->context = simix_global->context_factory->attach(
+ simix_global->cleanup_process_function, process);
+
+ process->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
+ XBT_RUNNING_CTX_INITIALIZE(process->running_ctx);
+
+ if(MC_is_active()){
+ MC_ignore_heap(process->running_ctx, sizeof(*process->running_ctx));
+ }
+
+ /* Add properties */
+ process->properties = properties;
+
+ /* Add the process to it's host process list */
+ xbt_swag_insert(process, sg_host_simix(host)->process_list);
+
+ /* Now insert it in the global process list and in the process to run list */
+ xbt_swag_insert(process, simix_global->process_list);
+ XBT_DEBUG("Inserting %s(%s) in the to_run list", process->name, sg_host_get_name(host));
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+
+ /* Tracing the process creation */
+ TRACE_msg_process_create(process->name, process->pid, process->host);
+
+ auto context = dynamic_cast<simgrid::simix::AttachContext*>(process->context);
+ if (!context)
+ xbt_die("Not a suitable context");
+
+ context->attach_start();
+ return process;
+}
+
+void SIMIX_process_detach(void)
+{
+ auto context = dynamic_cast<simgrid::simix::AttachContext*>(SIMIX_context_self());
+ if (!context)
+ xbt_die("Not a suitable context");
+
+ simix_global->cleanup_process_function(context->process());
+
+ // Let maestro ignore we are still alive:
+ // xbt_swag_remove(context->process(), simix_global->process_list);
+
+ // TODDO, Remove from proces list:
+ // xbt_swag_remove(process, sg_host_simix(host)->process_list);
+
+ context->attach_stop();
+ // delete context;
+}
+
/**
* \brief Executes the processes from simix_global->process_to_run.
*
/* destroy the blocking synchro if any */
if (process->waiting_synchro) {
- switch (process->waiting_synchro->type) {
+ simgrid::simix::Exec *exec = dynamic_cast<simgrid::simix::Exec*>(process->waiting_synchro);
+ simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
+ simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
+ simgrid::simix::Raw *raw = dynamic_cast<simgrid::simix::Raw*>(process->waiting_synchro);
+ simgrid::simix::Io *io = dynamic_cast<simgrid::simix::Io*>(process->waiting_synchro);
- case SIMIX_SYNC_EXECUTE:
- case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_process_execution_destroy(process->waiting_synchro);
- break;
+ if (exec != nullptr) {
+ exec->unref();
- case SIMIX_SYNC_COMMUNICATE:
+ } else if (comm != nullptr) {
xbt_fifo_remove(process->comms, process->waiting_synchro);
- SIMIX_comm_cancel(process->waiting_synchro);
+ comm->cancel();
xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall);
- SIMIX_comm_destroy(process->waiting_synchro);
- break;
+ comm->unref();
- case SIMIX_SYNC_SLEEP:
+ } else if (sleep != nullptr) {
SIMIX_process_sleep_destroy(process->waiting_synchro);
- break;
-
- case SIMIX_SYNC_JOIN:
- SIMIX_process_sleep_destroy(process->waiting_synchro);
- break;
- case SIMIX_SYNC_SYNCHRO:
+ } else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(process, &process->simcall);
- SIMIX_synchro_destroy(process->waiting_synchro);
- break;
+ delete process->waiting_synchro;
- case SIMIX_SYNC_IO:
+ } else if (io != nullptr) {
SIMIX_io_destroy(process->waiting_synchro);
- break;
-
}
+ /*
+ switch (process->waiting_synchro->type) {
+ case SIMIX_SYNC_JOIN:
+ SIMIX_process_sleep_destroy(process->waiting_synchro);
+ break;
+ } */
+
process->waiting_synchro = NULL;
}
if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) {
/* cancel the blocking synchro if any */
if (process->waiting_synchro) {
- switch (process->waiting_synchro->type) {
-
- case SIMIX_SYNC_EXECUTE:
- case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_process_execution_cancel(process->waiting_synchro);
- break;
+ simgrid::simix::Exec *exec = dynamic_cast<simgrid::simix::Exec*>(process->waiting_synchro);
+ if (exec != nullptr) {
+ SIMIX_execution_cancel(process->waiting_synchro);
+ }
- case SIMIX_SYNC_COMMUNICATE:
- xbt_fifo_remove(process->comms, process->waiting_synchro);
- SIMIX_comm_cancel(process->waiting_synchro);
- break;
+ simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
+ if (comm != nullptr) {
+ xbt_fifo_remove(process->comms, comm);
+ comm->cancel();
+ }
- case SIMIX_SYNC_SLEEP:
- case SIMIX_SYNC_JOIN:
+ simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
+ if (sleep != nullptr) {
SIMIX_process_sleep_destroy(process->waiting_synchro);
if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) {
XBT_DEBUG("Inserting %s in the to_run list", process->name);
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
- break;
+ }
- case SIMIX_SYNC_SYNCHRO:
+ simgrid::simix::Raw *raw = dynamic_cast<simgrid::simix::Raw*>(process->waiting_synchro);
+ if (raw != nullptr) {
SIMIX_synchro_stop_waiting(process, &process->simcall);
- break;
+ }
- case SIMIX_SYNC_IO:
+ simgrid::simix::Io *io = dynamic_cast<simgrid::simix::Io*>(process->waiting_synchro);
+ if (io != nullptr) {
SIMIX_io_destroy(process->waiting_synchro);
- break;
-
}
}
process->waiting_synchro = NULL;
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process)
{
- smx_synchro_t sync_suspend =
- SIMIX_process_suspend(process, simcall->issuer);
+ smx_synchro_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer);
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
} else {
xbt_fifo_push(sync_suspend->simcalls, simcall);
process->waiting_synchro = sync_suspend;
- SIMIX_host_execution_suspend(process->waiting_synchro);
+ process->waiting_synchro->suspend();
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
{
- xbt_assert((process != NULL), "Invalid parameters");
-
if (process->suspended) {
XBT_DEBUG("Process '%s' is already suspended", process->name);
return NULL;
process->suspended = 1;
- /* If we are suspending another process, and it is waiting on a sync,
- suspend its synchronization. */
+ /* If we are suspending another process that is waiting on a sync, suspend its synchronization. */
if (process != issuer) {
- if (process->waiting_synchro) {
-
- switch (process->waiting_synchro->type) {
-
- case SIMIX_SYNC_EXECUTE:
- case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_host_execution_suspend(process->waiting_synchro);
- break;
-
- case SIMIX_SYNC_COMMUNICATE:
- SIMIX_comm_suspend(process->waiting_synchro);
- break;
+ if (process->waiting_synchro)
+ process->waiting_synchro->suspend();
+ /* If the other process is not waiting, its suspension is delayed to when the process is rescheduled. */
- case SIMIX_SYNC_SLEEP:
- SIMIX_process_sleep_suspend(process->waiting_synchro);
- break;
-
- case SIMIX_SYNC_SYNCHRO:
- /* Suspension is delayed to when the process is rescheduled. */
- break;
-
- default:
- xbt_die("Internal error in SIMIX_process_suspend: unexpected synchronization type %d",
- (int)process->waiting_synchro->type);
- }
- return NULL;
- } else {
- /* Suspension is delayed to when the process is rescheduled. */
- return NULL;
- }
+ return NULL;
} else {
/* FIXME: computation size is zero. Is it okay that bound is zero ? */
- return SIMIX_process_execute(process, "suspend", 0.0, 1.0, 0.0, 0);
+ return SIMIX_execution_start(process, "suspend", 0.0, 1.0, 0.0, 0);
}
}
if (process != issuer) {
if (process->waiting_synchro) {
-
- switch (process->waiting_synchro->type) {
-
- case SIMIX_SYNC_EXECUTE:
- case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_host_execution_resume(process->waiting_synchro);
- break;
-
- case SIMIX_SYNC_COMMUNICATE:
- SIMIX_comm_resume(process->waiting_synchro);
- break;
-
- case SIMIX_SYNC_SLEEP:
- SIMIX_process_sleep_resume(process->waiting_synchro);
- break;
-
- case SIMIX_SYNC_SYNCHRO:
- /* I cannot resume it now. This is delayed to when the process is rescheduled at
- * the end of the synchro. */
- break;
-
- default:
- xbt_die("Internal error in SIMIX_process_resume: unexpected synchronization type %d",
- (int)process->waiting_synchro->type);
- }
+ process->waiting_synchro->resume();
}
} else XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
return self->ppid;
}
-void* SIMIX_process_self_get_data(smx_process_t self)
+void* SIMIX_process_self_get_data()
{
- xbt_assert(self == SIMIX_process_self(), "This is not the current process");
+ smx_process_t self = SIMIX_process_self();
if (!self) {
return NULL;
return SIMIX_process_get_data(self);
}
-void SIMIX_process_self_set_data(smx_process_t self, void *data)
+void SIMIX_process_self_set_data(void *data)
{
- xbt_assert(self == SIMIX_process_self(), "This is not the current process");
+ smx_process_t self = SIMIX_process_self();
SIMIX_process_set_data(self, data);
}
smx_process_t process = SIMIX_process_self();
if (process == NULL || process == simix_global->maestro_process)
- return "";
+ return "maestro";
return SIMIX_process_get_name(process);
}
simcall->issuer->waiting_synchro = sync;
}
-static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synchro_t sync){
- if (sync->sleep.surf_sleep) {
- sync->sleep.surf_sleep->cancel();
+static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synchro_t synchro){
+ simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
+
+ if (sleep->surf_sleep) {
+ sleep->surf_sleep->cancel();
smx_simcall_t simcall;
- while ((simcall = (smx_simcall_t) xbt_fifo_shift(sync->simcalls))) {
+ while ((simcall = (smx_simcall_t) xbt_fifo_shift(sleep->simcalls))) {
simcall_process_sleep__set__result(simcall, SIMIX_DONE);
simcall->issuer->waiting_synchro = NULL;
if (simcall->issuer->suspended) {
SIMIX_simcall_answer(simcall);
}
}
- sync->sleep.surf_sleep->unref();
- sync->sleep.surf_sleep = NULL;
+ sleep->surf_sleep->unref();
+ sleep->surf_sleep = NULL;
}
- xbt_mallocator_release(simix_global->synchro_mallocator, sync);
+ delete sleep;
return 0;
}
smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
{
smx_synchro_t res = SIMIX_process_sleep(issuer, timeout);
- res->type = SIMIX_SYNC_JOIN;
SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
return res;
}
sg_host_t host = process->host;
/* check if the host is active */
- if (host->is_off()) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- sg_host_get_name(host));
- }
+ if (host->isOff())
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
- smx_synchro_t synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator);
- synchro->type = SIMIX_SYNC_SLEEP;
+ simgrid::simix::Sleep *synchro = new simgrid::simix::Sleep();
synchro->name = NULL;
- synchro->category = NULL;
- synchro->sleep.host = host;
- synchro->sleep.surf_sleep = surf_host_sleep(host, duration);
-
- synchro->sleep.surf_sleep->setData(synchro);
+ synchro->host = host;
+ synchro->surf_sleep = surf_host_sleep(host, duration);
+ synchro->surf_sleep->setData(synchro);
XBT_DEBUG("Create sleep synchronization %p", synchro);
return synchro;
}
-void SIMIX_post_process_sleep(smx_synchro_t synchro)
-{
- smx_simcall_t simcall;
- e_smx_state_t state;
- xbt_assert(synchro->type == SIMIX_SYNC_SLEEP || synchro->type == SIMIX_SYNC_JOIN);
-
- while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) {
-
- switch (synchro->sleep.surf_sleep->getState()){
- case SURF_ACTION_FAILED:
- simcall->issuer->context->iwannadie = 1;
- //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
- state = SIMIX_SRC_HOST_FAILURE;
- break;
-
- case SURF_ACTION_DONE:
- state = SIMIX_DONE;
- break;
-
- default:
- THROW_IMPOSSIBLE;
- break;
- }
- if (simcall->issuer->host->is_off()) {
- simcall->issuer->context->iwannadie = 1;
- }
- simcall_process_sleep__set__result(simcall, state);
- simcall->issuer->waiting_synchro = NULL;
- if (simcall->issuer->suspended) {
- XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
- simcall->issuer->suspended = 0;
- simcall_HANDLER_process_suspend(simcall, simcall->issuer);
- } else {
- SIMIX_simcall_answer(simcall);
- }
- }
-
- SIMIX_process_sleep_destroy(synchro);
-}
-
void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
{
XBT_DEBUG("Destroy synchro %p", synchro);
- xbt_assert(synchro->type == SIMIX_SYNC_SLEEP || synchro->type == SIMIX_SYNC_JOIN);
+ simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
- if (synchro->sleep.surf_sleep) {
- synchro->sleep.surf_sleep->unref();
- synchro->sleep.surf_sleep = NULL;
+ if (sleep->surf_sleep) {
+ sleep->surf_sleep->unref();
+ sleep->surf_sleep = NULL;
}
- if (synchro->type == SIMIX_SYNC_SLEEP)
- xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
-}
-
-void SIMIX_process_sleep_suspend(smx_synchro_t synchro)
-{
- xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
- synchro->sleep.surf_sleep->suspend();
-}
-
-void SIMIX_process_sleep_resume(smx_synchro_t synchro)
-{
- XBT_DEBUG("Synchro state is %d on process_sleep_resume.", synchro->state);
- xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
- synchro->sleep.surf_sleep->resume();
}
/**
XBT_DEBUG("Yield process '%s'", self->name);
/* Go into sleep and return control to maestro */
- SIMIX_context_suspend(self->context);
+ self->context->suspend();
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", self->name);
if (self->doexception) {
XBT_DEBUG("Wait, maestro left me an exception");
self->doexception = 0;
- SMX_THROW();
+ RETHROW;
}
if(SMPI_switch_data_segment && self->segment_index != -1){
/* callback: context fetching */
xbt_running_ctx_t *SIMIX_process_get_running_context(void)
{
- return SIMIX_process_self()->running_ctx;
+ smx_process_t process = SIMIX_process_self();
+ if (process)
+ return process->running_ctx;
+ else
+ return nullptr;
}
/* callback: termination */
XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_get_name(process->host));
//retrieve the arguments of the old process
//FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
- s_smx_process_arg_t arg;
+ simgrid::simix::ProcessArg arg;
arg.code = process->code;
arg.hostname = sg_host_get_name(process->host);
arg.kill_time = SIMIX_timer_get_date(process->kill_timer);