args->code,
args->data,
args->hostname,
+ args->kill_time,
args->argc,
args->argv,
args->properties);
xbt_main_func_t code,
void *data,
const char *hostname,
+ double kill_time,
int argc, char **argv,
xbt_dict_t properties) {
XBT_DEBUG("Inserting %s(%s) in the to_run list", (*process)->name, host->name);
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, *process);
}
+
+ if (kill_time > SIMIX_get_clock()) {
+ if (simix_global->kill_process_function) {
+ XBT_DEBUG("Process %s(%s) will be kill at time %f", (*process)->name,
+ (*process)->smx_host->name, kill_time);
+ SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process);
+ }
+ }
}
/**
break;
}
}
-
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+ if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
/**
void SIMIX_pre_process_suspend(smx_simcall_t simcall)
{
smx_process_t process = simcall->process_suspend.process;
- SIMIX_process_suspend(process, simcall->issuer);
+ smx_action_t action_suspend =
+ SIMIX_process_suspend(process, simcall->issuer);
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
+ } else {
+ xbt_fifo_push(action_suspend->simcalls, simcall);
+ process->waiting_action = action_suspend;
+ SIMIX_host_execution_suspend(process->waiting_action);
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
-void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
+smx_action_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;
+ return NULL;
}
process->suspended = 1;
xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
(int)process->waiting_action->type);
}
+ return NULL;
+ } else {
+ DIE_IMPOSSIBLE;
+ return NULL;
}
+ } else {
+ return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
}
}
{
xbt_assert((process != NULL), "Invalid parameters");
+ if(process->context->iwannadie)
+ return;
+
process->suspended = 0;
/* If we are resuming another process, resume the action it was waiting for
}
}
else {
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+ DIE_IMPOSSIBLE;
+// if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
+// xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
}
}