/********* cpu object *****************/
/**************************************/
typedef struct cpu_L07 {
- surf_model_t model; /* Do not move this field: must match model_obj_t */
+ s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */
xbt_dict_t properties; /* Do not move this field: must match link_L07_t */
e_surf_workstation_model_type_t type; /* Do not move this field: must match link_L07_t */
- char *name; /* Do not move this field: must match link_L07_t */
lmm_constraint_t constraint; /* Do not move this field: must match link_L07_t */
double power_scale;
double power_current;
/**************************************/
typedef struct link_L07 {
- surf_model_t model; /* Do not move this field: must match model_obj_t */
+ s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */
xbt_dict_t properties; /* Do not move this field: must match link_L07_t */
e_surf_workstation_model_type_t type; /* Do not move this field: must match cpu_L07_t */
- char *name; /* Do not move this field: must match cpu_L07_t */
lmm_constraint_t constraint; /* Do not move this field: must match cpu_L07_t */
double lat_current;
tmgr_trace_event_t lat_event;
/******* Resource Public **********/
/**************************************/
-static const char *get_resource_name(void *resource_id)
-{
- /* We can freely cast as a cpu_L07_t because it has the same
- prefix as link_L07_t. However, only cpu_L07_t
- will theoretically be given as an argument here. */
-
- return ((cpu_L07_t) resource_id)->name;
-}
-
static xbt_dict_t get_properties(void *r)
{
/* We can freely cast as a cpu_L07_t since it has the same prefix than link_L07_t */
surf_action_workstation_L07_t action = NULL;
xbt_swag_t running_actions =
- surf_workstation_model->common_public.states.running_action_set;
+ surf_workstation_model->states.running_action_set;
double min = generic_maxmin_share_resources(running_actions,
xbt_swag_offset(s_action,
variable),
surf_action_workstation_L07_t action = NULL;
surf_action_workstation_L07_t next_action = NULL;
xbt_swag_t running_actions =
- surf_workstation_model->common_public.states.running_action_set;
+ surf_workstation_model->states.running_action_set;
xbt_swag_foreach_safe(action, next_action, running_actions) {
deltap = delta;
link_L07_t nw_link = id;
if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) {
- DEBUG2("Updating link %s (%p)", nw_link->name, nw_link);
+ DEBUG2("Updating link %s (%p)", nw_link->generic_resource.name, nw_link);
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint,
}
return;
} else if (cpu->type == SURF_WORKSTATION_RESOURCE_CPU) {
- DEBUG3("Updating cpu %s (%p) with value %g", cpu->name, cpu, value);
+ DEBUG3("Updating cpu %s (%p) with value %g", cpu->generic_resource.name, cpu, value);
if (event_type == cpu->power_event) {
cpu->power_current = value;
lmm_update_constraint_bound(ptask_maxmin_system, cpu->constraint,
}
surf_model_exit(surf_workstation_model);
-
- free(surf_workstation_model);
surf_workstation_model = NULL;
for (i = 0; i < nb_workstation; i++)
if (communication_amount[i * workstation_nb + j] > 0)
for (k = 0; k < route_size; k++) {
lat += route[k]->lat_current;
- xbt_dict_set(parallel_task_link_set, route[k]->name,
+ xbt_dict_set(parallel_task_link_set, route[k]->generic_resource.name,
route[k], NULL);
}
latency = MAX(latency, lat);
action->communication_amount = communication_amount;
action->latency = latency;
action->generic_action.state_set =
- surf_workstation_model->common_public.states.running_action_set;
+ surf_workstation_model->states.running_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
action->rate = rate;
{
surf_action_workstation_L07_t action = NULL;
- XBT_IN2("(%s,%g)", ((cpu_L07_t) cpu)->name, duration);
+ XBT_IN2("(%s,%g)", ((cpu_L07_t) cpu)->generic_resource.name, duration);
action = (surf_action_workstation_L07_t) execute(cpu, 1.0);
action->generic_action.max_duration = duration;
return route->size;
}
-static const char *get_link_name(const void *link)
-{
- return ((link_L07_t) link)->name;
-}
-
static double get_link_bandwidth(const void *link)
{
return ((link_L07_t) link)->bw_current;
static void cpu_free(void *cpu)
{
- free(((cpu_L07_t) cpu)->name);
xbt_dict_free(&(((cpu_L07_t) cpu)->properties));
- free(cpu);
+ surf_resource_free(cpu);
}
static cpu_L07_t cpu_new(const char *name, double power_scale,
xbt_assert1(!surf_model_resource_by_name(surf_workstation_model, name),
"Host '%s' declared several times in the platform file.", name);
- cpu->model = surf_workstation_model;
+ cpu->generic_resource.model = surf_workstation_model;
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
- cpu->name = xbt_strdup(name);
+ cpu->generic_resource.name = xbt_strdup(name);
cpu->id = nb_workstation++;
cpu->power_scale = power_scale;
static void link_free(void *nw_link)
{
- free(((link_L07_t) nw_link)->name);
xbt_dict_free(&(((link_L07_t) nw_link)->properties));
- free(nw_link);
+ surf_resource_free(nw_link);
}
static link_L07_t link_new(char *name,
xbt_assert1(!xbt_dict_get_or_null(link_set, name),
"Link '%s' declared several times in the platform file.", name);
- nw_link->model = surf_workstation_model;
+ nw_link->generic_resource.model = surf_workstation_model;
nw_link->type = SURF_WORKSTATION_RESOURCE_LINK;
- nw_link->name = name;
+ nw_link->generic_resource.name = name;
nw_link->bw_current = bw_initial;
if (bw_trace)
nw_link->bw_event =
static void model_init_internal(void)
{
- surf_workstation_model = xbt_new0(s_surf_model_t, 1);
-
- surf_model_init(surf_workstation_model);
+ surf_workstation_model = surf_model_init();
- surf_workstation_model->common_public.get_resource_name = get_resource_name;
- surf_workstation_model->common_public.action_get_state =
- surf_action_get_state;
- surf_workstation_model->common_public.action_get_start_time =
- surf_action_get_start_time;
- surf_workstation_model->common_public.action_get_finish_time =
+ surf_workstation_model->action_get_state = surf_action_get_state;
+ surf_workstation_model->action_get_start_time = surf_action_get_start_time;
+ surf_workstation_model->action_get_finish_time =
surf_action_get_finish_time;
- surf_workstation_model->common_public.action_use = action_use;
- surf_workstation_model->common_public.action_free = action_free;
- surf_workstation_model->common_public.action_cancel = action_cancel;
- surf_workstation_model->common_public.action_change_state =
- surf_action_change_state;
- surf_workstation_model->common_public.action_set_data =
- surf_action_set_data;
- surf_workstation_model->common_public.suspend = action_suspend;
- surf_workstation_model->common_public.resume = action_resume;
- surf_workstation_model->common_public.is_suspended = action_is_suspended;
- surf_workstation_model->common_public.set_max_duration =
- action_set_max_duration;
- surf_workstation_model->common_public.set_priority = action_set_priority;
- surf_workstation_model->common_public.name = "Workstation ptask_L07";
-
- surf_workstation_model->common_private->resource_used = resource_used;
- surf_workstation_model->common_private->share_resources = share_resources;
- surf_workstation_model->common_private->update_actions_state =
+ surf_workstation_model->action_use = action_use;
+ surf_workstation_model->action_free = action_free;
+ surf_workstation_model->action_cancel = action_cancel;
+ surf_workstation_model->action_change_state = surf_action_change_state;
+ surf_workstation_model->action_set_data = surf_action_set_data;
+ surf_workstation_model->suspend = action_suspend;
+ surf_workstation_model->resume = action_resume;
+ surf_workstation_model->is_suspended = action_is_suspended;
+ surf_workstation_model->set_max_duration = action_set_max_duration;
+ surf_workstation_model->set_priority = action_set_priority;
+ surf_workstation_model->name = "Workstation ptask_L07";
+
+ surf_workstation_model->model_private->resource_used = resource_used;
+ surf_workstation_model->model_private->share_resources = share_resources;
+ surf_workstation_model->model_private->update_actions_state =
update_actions_state;
- surf_workstation_model->common_private->update_resource_state =
+ surf_workstation_model->model_private->update_resource_state =
update_resource_state;
- surf_workstation_model->common_private->finalize = finalize;
+ surf_workstation_model->model_private->finalize = finalize;
surf_workstation_model->extension.workstation.execute = execute;
surf_workstation_model->extension.workstation.sleep = action_sleep;
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 =
get_link_bandwidth;
surf_workstation_model->extension.workstation.get_link_latency =
get_link_latency;
surf_workstation_model->extension.workstation.link_shared = link_shared;
- surf_workstation_model->common_public.get_properties = get_properties;
+ surf_workstation_model->get_properties = get_properties;
link_set = xbt_dict_new();
