void *arg = NULL;
xbt_dynar_foreach(model_list, iter, model) {
- if (xbt_swag_size(model->common_public.states.failed_action_set)
- || xbt_swag_size(model->common_public.states.done_action_set)) {
+ if (xbt_swag_size(model->states.failed_action_set)
+ || xbt_swag_size(model->states.done_action_set)) {
state_modifications = 1;
break;
}
DEBUG1("Elapsed_time %f", elapsed_time);
}
- while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) {
+ while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) {
DEBUG2("got %p %p", fun, arg);
if (fun == SIMIX_process_create) {
smx_process_arg_t args = arg;
args->argc, args->argv,
args->properties);
if (process && args->kill_time > SIMIX_get_clock()) {
- surf_timer_model->extension_public->set(args->kill_time, (void *)
- &SIMIX_process_kill,
- (void *) process);
+ surf_timer_model->extension.timer.set(args->kill_time, (void *)
+ &SIMIX_process_kill,
+ (void *) process);
}
xbt_free(args);
}
/* Wake up all process waiting for the action finish */
xbt_dynar_foreach(model_list, iter, model) {
- while ((action =
- xbt_swag_extract(model->common_public.
- states.failed_action_set))) {
+ while ((action = xbt_swag_extract(model->states.failed_action_set))) {
smx_action = action->data;
if (smx_action) {
xbt_fifo_unshift(actions_failed, smx_action);
}
}
- while ((action =
- xbt_swag_extract(model->common_public.
- states.done_action_set))) {
+ while ((action = xbt_swag_extract(model->states.done_action_set))) {
smx_action = action->data;
if (smx_action) {
xbt_fifo_unshift(actions_done, smx_action);
*/
void SIMIX_timer_set(double date, void *function, void *arg)
{
- surf_timer_model->extension_public->set(date, function, arg);
+ surf_timer_model->extension.timer.set(date, function, arg);
}
int SIMIX_timer_get(void **function, void **arg)
{
- return surf_timer_model->extension_public->get(function, arg);
+ return surf_timer_model->extension.timer.get(function, arg);
}
/**