#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "src/mc/Client.hpp"
-#include "src/simix/smx_private.hpp"
#include "src/msg/msg_private.h"
#include "src/simix/SynchroSleep.hpp"
void SIMIX_process_cleanup(smx_process_t process)
{
XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p",
- process->name, process, process->waiting_synchro);
+ process->name.c_str(), process, process->waiting_synchro);
SIMIX_process_on_exit_runall(process);
/* 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(comm);
+ comm->cancel();
if (comm->src_proc == process) {
XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
comm->src_proc = NULL;
/* I'm not supposed to destroy a detached comm from the sender side, */
- if (!comm->detached)
- SIMIX_comm_destroy(comm);
+ 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 (comm->dst_proc == process){
comm, (int)comm->state, comm->src_proc, comm->dst_proc);
comm->dst_proc = NULL;
- if (comm->detached && comm->refcount == 1 && 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(comm->src_proc->comms, comm);
}
- SIMIX_comm_destroy(comm);
+
+ comm->unref();
} else {
xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
}
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;
}
}
{
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 = "";
maestro->data = nullptr;
maestro->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
if (!code) {
- maestro->context = SIMIX_context_new(NULL, 0, nullptr, NULL, maestro);
+ 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");
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->isOff()) {
- SIMIX_host_add_auto_restart_process(arg->host,arg->name,arg->code, arg->data,
+ SIMIX_host_add_auto_restart_process(arg->host, arg->name.c_str(),
+ arg->code, arg->data,
sg_host_get_name(arg->host),
SIMIX_timer_get_date(arg->kill_timer),
- arg->argc,arg->argv,arg->properties,
+ arg->properties,
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;
-}
-
-
-void* simcall_HANDLER_process_create(smx_simcall_t simcall,
- const char *name,
- xbt_main_func_t code,
- void *data,
- const char *hostname,
- double kill_time,
- int argc, char **argv,
- xbt_dict_t properties,
- int auto_restart){
- return (void*)SIMIX_process_create(name, code, data, hostname,
- kill_time, argc, argv, properties, auto_restart,
- simcall->issuer);
-}
-
-static void kill_process(void* process)
-{
- simix_global->kill_process_function((smx_process_t) process);
+ XBT_DEBUG("Process %s (%s) is dead",
+ arg->name.c_str(), sg_host_get_name(arg->host));
+ arg->context->stop();
}
/**
*/
smx_process_t SIMIX_process_create(
const char *name,
- xbt_main_func_t code,
+ std::function<void()> code,
void *data,
const char *hostname,
double kill_time,
- int argc, char **argv,
xbt_dict_t properties,
int auto_restart,
smx_process_t parent_process)
XBT_DEBUG("Start process %s on host '%s'", name, hostname);
if (host->isOff()) {
- int i;
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
hostname);
- for (i = 0; i < argc; i++)
- xbt_free(argv[i]);
- xbt_free(argv);
+ return nullptr;
}
else {
- process = xbt_new0(s_smx_process_t, 1);
+ process = new simgrid::simix::Process();
- xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
+ xbt_assert(code && host != NULL, "Invalid parameters");
/* Process data */
process->pid = simix_process_maxpid++;
- process->name = xbt_strdup(name);
+ process->name = simgrid::xbt::string(name);
process->host = host;
process->data = data;
process->comms = xbt_fifo_new();
/* Process data for auto-restart */
process->auto_restart = auto_restart;
process->code = code;
- process->argc = argc;
- process->argv = argv;
-
- XBT_VERB("Create context %s", process->name);
- process->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, process);
+ XBT_VERB("Create context %s", process->name.c_str());
+ process->context = SIMIX_context_new(
+ std::move(code),
+ 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);
/* Add the process to it's host process list */
xbt_swag_insert(process, sg_host_simix(host)->process_list);
- XBT_DEBUG("Start context '%s'", process->name);
+ XBT_DEBUG("Start context '%s'", process->name.c_str());
/* 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_DEBUG("Inserting %s(%s) in the to_run list",
+ process->name.c_str(), sg_host_get_name(host));
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
if (kill_time > SIMIX_get_clock() && simix_global->kill_process_function) {
- XBT_DEBUG("Process %s(%s) will be kill at time %f", process->name,
- sg_host_get_name(process->host), kill_time);
- process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
+ XBT_DEBUG("Process %s(%s) will be kill at time %f",
+ process->name.c_str(), sg_host_get_name(process->host), kill_time);
+ process->kill_timer = SIMIX_timer_set(kill_time, [=]() {
+ simix_global->kill_process_function(process);
+ });
}
/* Tracing the process creation */
- TRACE_msg_process_create(process->name, process->pid, process->host);
+ TRACE_msg_process_create(process->name.c_str(), process->pid, process->host);
}
return process;
}
return nullptr;
}
- smx_process_t process = xbt_new0(s_smx_process_t, 1);
+ smx_process_t process = new simgrid::simix::Process();
/* Process data */
process->pid = simix_process_maxpid++;
- process->name = xbt_strdup(name);
+ process->name = std::string(name);
process->host = host;
process->data = data;
process->comms = xbt_fifo_new();
/* 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);
+ XBT_VERB("Create context %s", process->name.c_str());
if (!simix_global)
xbt_die("simix is not initialized, please call MSG_init first");
process->context = simix_global->context_factory->attach(
/* 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_DEBUG("Inserting %s(%s) in the to_run list",
+ process->name.c_str(), 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);
+ TRACE_msg_process_create(process->name.c_str(), process->pid, process->host);
auto context = dynamic_cast<simgrid::simix::AttachContext*>(process->context);
if (!context)
*/
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
- XBT_DEBUG("Killing process %s on %s", process->name, sg_host_get_name(process->host));
+ XBT_DEBUG("Killing process %s on %s",
+ process->name.c_str(), sg_host_get_name(process->host));
process->context->iwannadie = 1;
process->blocked = 0;
simgrid::simix::Io *io = dynamic_cast<simgrid::simix::Io*>(process->waiting_synchro);
if (exec != nullptr) {
- SIMIX_execution_destroy(process->waiting_synchro);
+ exec->unref();
} 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);
+ comm->unref();
} else if (sleep != nullptr) {
SIMIX_process_sleep_destroy(process->waiting_synchro);
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(process, &process->simcall);
- SIMIX_synchro_destroy(process->waiting_synchro);
+ delete process->waiting_synchro;
} else if (io != nullptr) {
SIMIX_io_destroy(process->waiting_synchro);
process->waiting_synchro = NULL;
}
if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) {
- XBT_DEBUG("Inserting %s in the to_run list", process->name);
+ XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str());
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
if (comm != nullptr) {
- xbt_fifo_remove(process->comms, process->waiting_synchro);
- SIMIX_comm_cancel(process->waiting_synchro);
+ xbt_fifo_remove(process->comms, comm);
+ comm->cancel();
}
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_DEBUG("Inserting %s in the to_run list", process->name.c_str());
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
}
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_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)
{
if (process->suspended) {
- XBT_DEBUG("Process '%s' is already suspended", process->name);
+ XBT_DEBUG("Process '%s' is already suspended", process->name.c_str());
return NULL;
}
return process->host;
}
-xbt_main_func_t SIMIX_process_get_code(void){
- return SIMIX_process_self()->code;
-}
-
/* needs to be public and without simcall because it is called
by exceptions and logging events */
const char* SIMIX_process_self_get_name(void) {
const char* SIMIX_process_get_name(smx_process_t process)
{
- return process->name;
+ return process->name.c_str();
}
smx_process_t SIMIX_process_get_by_name(const char* name)
{
smx_process_t proc;
-
- xbt_swag_foreach(proc, simix_global->process_list)
- {
- if(!strcmp(name, proc->name))
+ xbt_swag_foreach(proc, simix_global->process_list) {
+ if (proc->name == name)
return proc;
}
return NULL;
return synchro;
}
-void SIMIX_post_process_sleep(smx_synchro_t synchro)
-{
- smx_simcall_t simcall;
- e_smx_state_t state;
- simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
-
- while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) {
-
- switch (sleep->surf_sleep->getState()){
- case simgrid::surf::Action::State::failed:
- simcall->issuer->context->iwannadie = 1;
- //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
- state = SIMIX_SRC_HOST_FAILURE;
- break;
-
- case simgrid::surf::Action::State::done:
- state = SIMIX_DONE;
- break;
-
- default:
- THROW_IMPOSSIBLE;
- break;
- }
- if (simcall->issuer->host->isOff()) {
- 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);
*/
void SIMIX_process_yield(smx_process_t self)
{
- XBT_DEBUG("Yield process '%s'", self->name);
+ XBT_DEBUG("Yield process '%s'", self->name.c_str());
/* 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);
+ XBT_DEBUG("Control returned to me: '%s'", self->name.c_str());
if (self->new_host) {
SIMIX_process_change_host(self, self->new_host);
}
/** @brief Restart a process, starting it again from the beginning. */
smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) {
- XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_get_name(process->host));
+ XBT_DEBUG("Restarting process %s on %s",
+ process->name.c_str(), 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.name = process->name;
arg.code = process->code;
arg.hostname = sg_host_get_name(process->host);
arg.kill_time = SIMIX_timer_get_date(process->kill_timer);
- arg.argc = process->argc;
arg.data = process->data;
- int i;
- arg.argv = xbt_new(char*,process->argc + 1);
- for (i = 0; i < arg.argc; i++) {
- arg.argv[i] = xbt_strdup(process->argv[i]);
- }
- arg.argv[process->argc] = NULL;
arg.properties = NULL;
arg.auto_restart = process->auto_restart;
+
//kill the old process
- SIMIX_process_kill(process,issuer);
- //start the new process
- smx_process_t new_process;
- if (simix_global->create_process_function) {
- new_process = simix_global->create_process_function(
- arg.argv[0],
- arg.code,
- arg.data,
- arg.hostname,
- arg.kill_time,
- arg.argc,
- arg.argv,
- arg.properties,
- arg.auto_restart,
- NULL);
- } else {
- new_process = simcall_process_create(
- arg.argv[0],
- arg.code,
- arg.data,
- arg.hostname,
- arg.kill_time,
- arg.argc,
- arg.argv,
- arg.properties,
- arg.auto_restart);
+ SIMIX_process_kill(process, issuer);
- }
- return new_process;
+ //start the new process
+ if (simix_global->create_process_function)
+ return simix_global->create_process_function(
+ arg.name.c_str(), std::move(arg.code), arg.data,
+ arg.hostname, arg.kill_time,
+ arg.properties, arg.auto_restart,
+ nullptr);
+ else
+ return simcall_process_create(
+ arg.name.c_str(), std::move(arg.code), arg.data,
+ arg.hostname, arg.kill_time,
+ arg.properties, arg.auto_restart);
}
void SIMIX_segment_index_set(smx_process_t proc, int index){
proc->segment_index = index;
}
+
+smx_process_t simcall_process_create(
+ const char *name, std::function<void()> code, void *data,
+ const char *hostname, double kill_time,
+ xbt_dict_t properties, int auto_restart)
+{
+ if (name == nullptr)
+ name = "";
+ smx_process_t self = SIMIX_process_self();
+ return simgrid::simix::kernel([&] {
+ return SIMIX_process_create(name,
+ std::move(code), data, hostname,
+ kill_time, properties, auto_restart,
+ self);
+ });
+}
\ No newline at end of file
