xbt_swag_remove(arg, simix_global->process_list);
xbt_swag_remove(arg, simix_global->process_to_run);
xbt_swag_remove(arg,
- ((smx_process_t) arg)->simdata->s_host->simdata->
+ ((smx_process_t) arg)->simdata->smx_host->simdata->
process_list);
free(((smx_process_t) arg)->name);
((smx_process_t) arg)->name = NULL;
xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
/* Simulator Data */
- simdata->s_host = host;
+ simdata->smx_host = host;
simdata->mutex = NULL;
simdata->cond = NULL;
simdata->argc = argc;
simdata->argv = argv;
- simdata->context = xbt_context_new(code, NULL, NULL,
+ simdata->context = xbt_context_new(name,code, NULL, NULL,
simix_global->
cleanup_process_function, process,
simdata->argc, simdata->argv);
name, host, data, jprocess, jenv);
xbt_assert0(host, "Invalid parameters");
/* Simulator Data */
- simdata->s_host = host;
+ simdata->smx_host = host;
simdata->mutex = NULL;
simdata->cond = NULL;
simdata->argc = 0;
simdata->argv = NULL;
- simdata->context = xbt_context_new(NULL, NULL, NULL,
+ simdata->context = xbt_context_new(name,NULL, NULL, NULL,
simix_global->
cleanup_process_function, process,
/* argc/argv */ 0, NULL);
smx_simdata_process_t p_simdata = process->simdata;
DEBUG2("Killing process %s on %s", process->name,
- p_simdata->s_host->name);
+ p_simdata->smx_host->name);
/* Cleanup if we were waiting for something */
if (p_simdata->mutex)
xbt_assert0(((process != NULL)
&& (process->simdata)), "Invalid parameters");
- return (process->simdata->s_host);
+ return (process->simdata->smx_host);
}
/**
simdata->suspended = 1;
c = simdata->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_resource->common_public->suspend(act->simdata->
+ surf_workstation_model->common_public->suspend(act->simdata->
surf_action);
}
} else {
cond = SIMIX_cond_init();
dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
- surf_workstation_resource->common_public->set_priority(dummy->simdata->
- surf_action,
- 0.0);
+ surf_workstation_model->common_public->suspend(dummy->simdata->surf_action);
SIMIX_register_action_to_condition(dummy, cond);
__SIMIX_cond_wait(cond);
//SIMIX_action_destroy(dummy);
simdata->suspended = 0;
c = simdata->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_resource->common_public->resume(act->simdata->
- surf_action);
+ surf_workstation_model->common_public->resume(act->simdata->surf_action);
}
+ SIMIX_cond_signal(c);
return;
} else {
simdata->suspended = 0;