simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
}
-static void kill_process_from_timer(void* arg)
-{
- smx_process_t process = (smx_process_t) arg;
- simix_global->kill_process_function(process);
- process->kill_timer=NULL;
-}
-
/**
* \ingroup simix_process_management
* \brief Set the kill time of a process.
void simcall_process_set_kill_time(smx_process_t process, double kill_time)
{
- if (kill_time > SIMIX_get_clock()) {
- if (simix_global->kill_process_function) {
- XBT_DEBUG("Set kill time %f for process %s(%s)",
- kill_time, process->name.c_str(),
- sg_host_get_name(process->host));
- process->kill_timer = SIMIX_timer_set(kill_time, kill_process_from_timer, process);
- }
- }
+ if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr)
+ return;
+ XBT_DEBUG("Set kill time %f for process %s(%s)",
+ kill_time, process->name.c_str(), sg_host_get_name(process->host));
+ process->kill_timer = SIMIX_timer_set(kill_time, [=] {
+ simix_global->kill_process_function(process);
+ process->kill_timer=NULL;
+ });
}
/**
* \ingroup simix_process_management
return res;
}
-static void kill_process(void* process)
-{
- simix_global->kill_process_function((smx_process_t) process);
-}
-
/**
* \brief Internal function to create a 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.c_str(), sg_host_get_name(process->host), kill_time);
- process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
+ process->kill_timer = SIMIX_timer_set(kill_time, [=]() {
+ simix_global->kill_process_function(process);
+ });
}
/* Tracing the process creation */
XBT_DEBUG("Process %s(%s) will be started at time %f",
arg->name.c_str(), arg->hostname, start_time);
- SIMIX_timer_set(start_time, [](void* p) {
- smx_process_arg_t arg = static_cast<smx_process_arg_t>(p);
+ SIMIX_timer_set(start_time, [=]() {
simix_global->create_process_function(
arg->name.c_str(),
std::move(arg->code),
arg->auto_restart,
NULL);
delete arg;
- }, arg);
+ });
} else { // start_time <= SIMIX_get_clock()
XBT_DEBUG("Starting Process %s(%s) right now",
arg->name.c_str(), sg_host_get_name(host));