XBT_DEBUG("%p should not be run anymore",process);
simix_global->process_list.erase(process->pid);
if (process->host)
- xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
+ xbt_swag_remove(process, process->host->extension<simgrid::simix::Host>()->process_list);
xbt_swag_insert(process, simix_global->process_to_destroy);
process->context->iwannadie = 0;
std::function<void()> code,
void *data,
sg_host_t host,
- double kill_time,
xbt_dict_t properties,
- int auto_restart,
smx_actor_t parent_process)
{
- smx_actor_t process = nullptr;
XBT_DEBUG("Start process %s on host '%s'", name, host->cname());
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->cname());
return nullptr;
}
- else {
- process = new simgrid::simix::ActorImpl();
-
- xbt_assert(code && host != nullptr, "Invalid parameters");
- /* Process data */
- process->pid = simix_process_maxpid++;
- process->name = simgrid::xbt::string(name);
- process->host = host;
- process->data = data;
- process->comms = xbt_fifo_new();
- process->simcall.issuer = process;
- /* Initiliaze data segment to default value */
- SIMIX_segment_index_set(process, -1);
-
- if (parent_process != nullptr) {
- process->ppid = parent_process->pid;
- /* SMPI process have their own data segment and each other inherit from their father */
+
+ smx_actor_t process = new simgrid::simix::ActorImpl();
+
+ xbt_assert(code && host != nullptr, "Invalid parameters");
+ /* Process data */
+ process->pid = simix_process_maxpid++;
+ process->name = simgrid::xbt::string(name);
+ process->host = host;
+ process->data = data;
+ process->comms = xbt_fifo_new();
+ process->simcall.issuer = process;
+ /* Initiliaze data segment to default value */
+ SIMIX_segment_index_set(process, -1);
+
+ if (parent_process != nullptr) {
+ process->ppid = parent_process->pid;
+/* 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);
- }
- }
+ 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
- } else {
- process->ppid = -1;
- }
+ } else {
+ process->ppid = -1;
+ }
- /* Process data for auto-restart */
- process->auto_restart = auto_restart;
- process->code = code;
+ process->auto_restart = false;
+ process->code = code;
- XBT_VERB("Create context %s", process->name.c_str());
- process->context = SIMIX_context_new(
- std::move(code),
- 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);
- /* Add properties */
- process->properties = properties;
+ /* Add properties */
+ process->properties = properties;
- /* Add the process to it's host process list */
- xbt_swag_insert(process, sg_host_simix(host)->process_list);
+ /* Add the process to it's host process list */
+ xbt_swag_insert(process, host->extension<simgrid::simix::Host>()->process_list);
- XBT_DEBUG("Start context '%s'", process->name.c_str());
+ XBT_DEBUG("Start context '%s'", process->name.c_str());
- /* Now insert it in the global process list and in the process to run list */
- simix_global->process_list[process->pid] = process;
- XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname());
- xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process);
+ /* Now insert it in the global process list and in the process to run list */
+ simix_global->process_list[process->pid] = process;
+ XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname());
+ xbt_dynar_push_as(simix_global->process_to_run, smx_actor_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->cname(), process->host->cname(), 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->cname(), process->pid, process->host);
- /* Tracing the process creation */
- TRACE_msg_process_create(process->cname(), process->pid, process->host);
- }
return process;
}
-smx_actor_t SIMIX_process_attach(
- const char* name,
- void *data,
- const char* hostname,
- xbt_dict_t properties,
- smx_actor_t parent_process)
+smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname, xbt_dict_t properties,
+ smx_actor_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.
process->properties = properties;
/* Add the process to it's host process list */
- xbt_swag_insert(process, sg_host_simix(host)->process_list);
+ xbt_swag_insert(process, host->extension<simgrid::simix::Host>()->process_list);
/* Now insert it in the global process list and in the process to run list */
simix_global->process_list[process->pid] = process;
void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest)
{
xbt_assert((process != nullptr), "Invalid parameters");
- xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
+ xbt_swag_remove(process, process->host->extension<simgrid::simix::Host>()->process_list);
process->host = dest;
- xbt_swag_insert(process, sg_host_simix(dest)->process_list);
+ xbt_swag_insert(process, dest->extension<simgrid::simix::Host>()->process_list);
}
if (!self) {
return nullptr;
}
- return SIMIX_process_get_data(self);
+ return self->data;
}
void SIMIX_process_self_set_data(void *data)
SIMIX_process_set_data(self, data);
}
-void* SIMIX_process_get_data(smx_actor_t process)
-{
- return process->data;
-}
-
void SIMIX_process_set_data(smx_actor_t process, void *data)
{
process->data = data;
SIMIX_process_kill(process, issuer);
//start the new process
- return simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host,
- arg.kill_time, arg.properties, arg.auto_restart, nullptr);
+ smx_actor_t actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host,
+ arg.properties, nullptr);
+ if (arg.kill_time >= 0)
+ simcall_process_set_kill_time(actor, arg.kill_time);
+ if (arg.auto_restart)
+ simcall_process_auto_restart_set(actor, arg.auto_restart);
+
+ return actor;
}
void SIMIX_segment_index_set(smx_actor_t proc, int index){
* \param properties the properties of the process
* \param auto_restart either it is autorestarting or not.
*/
-smx_actor_t simcall_process_create(const char *name,
- xbt_main_func_t code,
- void *data,
- sg_host_t host,
- double kill_time,
- int argc, char **argv,
- xbt_dict_t properties,
- int auto_restart)
+smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc,
+ char** argv, xbt_dict_t properties)
{
if (name == nullptr)
name = "";
for (int i = 0; i != argc; ++i)
xbt_free(argv[i]);
xbt_free(argv);
- smx_actor_t res = simcall_process_create(name,
- std::move(wrapped_code),
- data, host, kill_time, properties, auto_restart);
+ smx_actor_t res = simcall_process_create(name, std::move(wrapped_code), data, host, properties);
return res;
}
-smx_actor_t simcall_process_create(
- const char *name, std::function<void()> code, void *data,
- sg_host_t host, double kill_time,
- xbt_dict_t properties, int auto_restart)
+smx_actor_t simcall_process_create(const char* name, std::function<void()> code, void* data, sg_host_t host,
+ xbt_dict_t properties)
{
if (name == nullptr)
name = "";
smx_actor_t self = SIMIX_process_self();
- return simgrid::simix::kernelImmediate([&] {
- return SIMIX_process_create(name, std::move(code), data, host, kill_time, properties, auto_restart, self);
+ return simgrid::simix::kernelImmediate([name, code, data, host, properties, self] {
+ return SIMIX_process_create(name, std::move(code), data, host, properties, self);
});
}
