action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->workstation_nb = workstation_nb;
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->workstation_nb = workstation_nb;
xbt_assert1(!surf_model_resource_by_name(surf_workstation_model, name),
"Host '%s' declared several times in the platform file.", name);
xbt_assert1(!surf_model_resource_by_name(surf_workstation_model, name),
"Host '%s' declared several times in the platform file.", name);
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
cpu->name = xbt_strdup(name);
cpu->id = nb_workstation++;
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
cpu->name = xbt_strdup(name);
cpu->id = nb_workstation++;
- xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, cpu, cpu_free);
+ xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, cpu,
+ cpu_free);
xbt_assert1(!xbt_dict_get_or_null(link_set, name),
"Link '%s' declared several times in the platform file.", name);
xbt_assert1(!xbt_dict_get_or_null(link_set, name),
"Link '%s' declared several times in the platform file.", name);
- surf_model_init((surf_model_t)surf_workstation_model);
- surf_workstation_model->extension_public =
- xbt_new0(s_surf_workstation_model_extension_public_t, 1);
+ surf_model_init(surf_workstation_model);
surf_workstation_model->common_public.action_get_state =
surf_action_get_state;
surf_workstation_model->common_public.action_get_start_time =
surf_workstation_model->common_public.action_get_state =
surf_action_get_state;
surf_workstation_model->common_public.action_get_start_time =
- surf_workstation_model->extension_public->execute = execute;
- surf_workstation_model->extension_public->sleep = action_sleep;
- surf_workstation_model->extension_public->get_state = resource_get_state;
- surf_workstation_model->extension_public->get_speed = get_speed;
- surf_workstation_model->extension_public->get_available_speed =
+ surf_workstation_model->extension.workstation.execute = execute;
+ surf_workstation_model->extension.workstation.sleep = action_sleep;
+ surf_workstation_model->extension.workstation.get_state =
+ resource_get_state;
+ surf_workstation_model->extension.workstation.get_speed = get_speed;
+ surf_workstation_model->extension.workstation.get_available_speed =
- surf_workstation_model->extension_public->communicate = communicate;
- surf_workstation_model->extension_public->execute_parallel_task =
+ surf_workstation_model->extension.workstation.communicate = communicate;
+ surf_workstation_model->extension.workstation.execute_parallel_task =
- surf_workstation_model->extension_public->get_route = get_route;
- surf_workstation_model->extension_public->get_route_size = get_route_size;
- surf_workstation_model->extension_public->get_link_name = get_link_name;
- surf_workstation_model->extension_public->get_link_bandwidth =
+ surf_workstation_model->extension.workstation.get_route = get_route;
+ surf_workstation_model->extension.workstation.get_route_size =
+ get_route_size;
+ surf_workstation_model->extension.workstation.get_link_name = get_link_name;
+ surf_workstation_model->extension.workstation.get_link_bandwidth =
define_callbacks(filename);
update_model_description(surf_workstation_model_description,
define_callbacks(filename);
update_model_description(surf_workstation_model_description,