XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
-/**
- * \brief Internal function to create a SIMIX host.
- * \param name name of the host to create
- */
+/** @brief Internal function to create a SIMIX host. */
void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter
{
smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
- s_smx_process_t proc;
/* Host structure */
+ simgrid::simix::Process proc;
smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
sg_host_simix_set(host, smx_host);
}
-/**
- * \brief Start the host if it is off
- *
- */
+/** @brief Start the host if it is off */
void SIMIX_host_on(sg_host_t h)
{
smx_host_priv_t host = sg_host_simix(h);
unsigned int cpt;
smx_process_arg_t arg;
xbt_dynar_foreach(host->boot_processes,cpt,arg) {
-
- char** argv = xbt_new(char*, arg->argc);
- for (int i=0; i<arg->argc; i++)
- argv[i] = xbt_strdup(arg->argv[i]);
-
- XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname);
+ XBT_DEBUG("Booting Process %s(%s) right now",
+ arg->name.c_str(), arg->hostname);
if (simix_global->create_process_function) {
- simix_global->create_process_function(argv[0],
+ simix_global->create_process_function(arg->name.c_str(),
arg->code,
NULL,
arg->hostname,
arg->kill_time,
- arg->argc,
- argv,
arg->properties,
arg->auto_restart,
NULL);
} else {
- simcall_process_create(arg->argv[0],
+ simcall_process_create(arg->name.c_str(),
arg->code,
NULL,
arg->hostname,
arg->kill_time,
- arg->argc,
- argv,
arg->properties,
arg->auto_restart);
}
}
}
-/**
- * \brief Stop the host if it is on
- *
- */
+/** @brief Stop the host if it is on */
void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
{
smx_host_priv_t host = sg_host_simix(h);
smx_process_t process = NULL;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_get_name(process->host), issuer->name);
+ XBT_DEBUG("Killing %s on %s by %s",
+ process->name.c_str(), sg_host_get_name(process->host),
+ issuer->name.c_str());
}
}
} else {
- XBT_INFO("Host %s is already off",h->name().c_str());
+ XBT_INFO("Host %s is already off", h->name().c_str());
}
}
smx_process_t process = NULL;
xbt_swag_foreach(process, host->process_list) {
- tmp = bprintf("%s\n\t%s", msg, process->name);
+ tmp = bprintf("%s\n\t%s", msg, process->name.c_str());
free(msg);
msg = tmp;
}
return (process == NULL) ? NULL : SIMIX_process_get_host(process);
}
-/* needs to be public and without simcall because it is called
- by exceptions and logging events */
+/* needs to be public and without simcall for exceptions and logging events */
const char* SIMIX_host_self_get_name(void)
{
sg_host_t host = SIMIX_host_self();
void _SIMIX_host_free_process_arg(void *data)
{
smx_process_arg_t arg = *(smx_process_arg_t*)data;
- for (int i = 0; i < arg->argc; i++)
- xbt_free(arg->argv[i]);
- xbt_free(arg->argv);
- xbt_free(arg->name);
- xbt_free(arg);
+ delete arg;
}
/**
* \brief Add a process to the list of the processes that the host will restart when it comes back
* The processes will only be restarted once, meaning that you will have to register the process
* again to restart the process again.
*/
-void SIMIX_host_add_auto_restart_process(sg_host_t host,
- 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)
+void SIMIX_host_add_auto_restart_process(
+ sg_host_t host, const char *name, std::function<void()> code,
+ void* data, const char *hostname, double kill_time,
+ xbt_dict_t properties, int auto_restart)
{
if (!sg_host_simix(host)->auto_restart_processes) {
sg_host_simix(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
}
- smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1);
- arg->name = xbt_strdup(name);
- arg->code = code;
+ smx_process_arg_t arg = new simgrid::simix::ProcessArg();
+ arg->name = name;
+ arg->code = std::move(code);
arg->data = data;
arg->hostname = hostname;
arg->kill_time = kill_time;
- arg->argc = argc;
-
- arg->argv = xbt_new(char*,argc + 1);
-
- for (int i = 0; i < argc; i++)
- arg->argv[i] = xbt_strdup(argv[i]);
- arg->argv[argc] = NULL;
-
arg->properties = properties;
arg->auto_restart = auto_restart;
}
xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg);
}
-/**
- * \brief Restart the list of processes that have been registered to the host
- */
+/** @brief Restart the list of processes that have been registered to the host */
void SIMIX_host_autorestart(sg_host_t host)
{
unsigned int cpt;
xbt_dynar_foreach (process_list, cpt, arg) {
- XBT_DEBUG("Restarting Process %s(%s) right now", arg->argv[0], arg->hostname);
+ XBT_DEBUG("Restarting Process %s(%s) right now", arg->name.c_str(), arg->hostname);
if (simix_global->create_process_function) {
- simix_global->create_process_function(arg->argv[0],
+ simix_global->create_process_function(arg->name.c_str(),
arg->code,
NULL,
arg->hostname,
arg->kill_time,
- arg->argc,
- arg->argv,
arg->properties,
arg->auto_restart,
NULL);
} else {
- simcall_process_create(arg->argv[0],
- (xbt_main_func_t) arg->code,
+ simcall_process_create(arg->name.c_str(),
+ arg->code,
NULL,
arg->hostname,
arg->kill_time,
- arg->argc,
- arg->argv,
arg->properties,
arg->auto_restart);
-
}
- /* arg->argv is used by the process created above. Hide it to
- * _SIMIX_host_free_process_arg() which is called by xbt_dynar_reset()
- * below. */
- arg->argc = 0;
- arg->argv = NULL;
}
xbt_dynar_reset(process_list);
}
double flops_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
- simgrid::simix::Exec *exec = new simgrid::simix::Exec();
- exec->name = xbt_strdup(name);
- exec->state = SIMIX_RUNNING;
- exec->host = issuer->host;
+ simgrid::simix::Exec *exec = new simgrid::simix::Exec(name, issuer->host);
/* set surf's action */
if (!MC_is_active() && !MC_record_replay_is_active()) {
}
}
- XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name);
+ XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name.c_str());
return exec;
}
int i;
/* alloc structures and initialize */
- simgrid::simix::Exec *exec = new simgrid::simix::Exec();
- exec->name = xbt_strdup(name);
- exec->state = SIMIX_RUNNING;
- exec->host = nullptr; /* FIXME: do we need the list of hosts? */
+ simgrid::simix::Exec *exec = new simgrid::simix::Exec(name, nullptr);
/* set surf's synchro */
host_list_cpy = xbt_new0(sg_host_t, host_nb);
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
/* Associate this simcall to the synchro */
- xbt_fifo_push(synchro->simcalls, simcall);
+ synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
/* set surf's synchro */
SIMIX_execution_finish(exec);
}
-void SIMIX_execution_suspend(smx_synchro_t synchro)
-{
- synchro->suspend(); // FIXME: USELESS
-}
-
-void SIMIX_execution_resume(smx_synchro_t synchro)
-{
- synchro->resume(); // FIXME: USELESS
-}
-
void SIMIX_execution_finish(simgrid::simix::Exec *exec)
{
- xbt_fifo_item_t item;
- smx_simcall_t simcall;
-
- xbt_fifo_foreach(exec->simcalls, item, simcall, smx_simcall_t) {
-
+ for (smx_simcall_t simcall : exec->simcalls) {
switch (exec->state) {
case SIMIX_DONE:
