arg->kill_time = kill_time;
arg->argc = argc;
- arg->argv = xbt_new(char*,argc);
+ arg->argv = xbt_new(char*,argc + 1);
int i;
for (i = 0; i < argc; i++) {
arg->argv[i] = xbt_strdup(argv[i]);
}
+ arg->argv[argc] = NULL;
arg->properties = properties;
arg->auto_restart = auto_restart;
#endif
/* set surf's action */
- if (!MC_IS_ENABLED) {
+ if (!MC_is_active()) {
action->execution.surf_exec =
surf_workstation_model->extension.workstation.execute(host->host,
computation_amount);
workstation_list[i] = host_list[i]->host;
/* set surf's action */
- if (!MC_IS_ENABLED) {
+ if (!MC_is_active()) {
action->execution.surf_exec =
surf_workstation_model->extension.workstation.
execute_parallel_task(host_nb, workstation_list, computation_amount,
void SIMIX_host_execution_destroy(smx_action_t action)
{
- int destroyed=0;
XBT_DEBUG("Destroy action %p", action);
-
if (action->execution.surf_exec) {
- destroyed = surf_workstation_model->action_unref(action->execution.surf_exec);
+ surf_workstation_model->action_unref(action->execution.surf_exec);
action->execution.surf_exec = NULL;
}
-
- if (destroyed) {
- xbt_free(action->name);
- xbt_mallocator_release(simix_global->action_mallocator, action);
- }
+ xbt_free(action->name);
+ xbt_mallocator_release(simix_global->action_mallocator, action);
}
void SIMIX_host_execution_cancel(smx_action_t action)
simcall->issuer->waiting_action = action;
/* set surf's action */
- if (MC_IS_ENABLED) {
+ if (MC_is_active()) {
action->state = SIMIX_DONE;
SIMIX_execution_finish(action);
return;