surf_model_t surf_workstation_model = NULL;
-static void workstation_free(void *workstation)
-{
- free(((workstation_CLM03_t) workstation)->name);
- free(workstation);
-}
-
static workstation_CLM03_t workstation_new(const char *name,
void *cpu, void *card)
{
workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
- workstation->model = surf_workstation_model;
- workstation->name = xbt_strdup(name);
+ workstation->generic_resource.model = surf_workstation_model;
+ workstation->generic_resource.name = xbt_strdup(name);
workstation->cpu = cpu;
workstation->network_card = card;
xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
- workstation, workstation_free);
+ workstation, surf_resource_free);
return workstation;
}
}
}
-static const char *get_resource_name(void *resource_id)
-{
- return ((workstation_CLM03_t) resource_id)->name;
-}
-
static int resource_used(void *resource_id)
{
THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
{
if (action->model_type == surf_network_model)
- return surf_network_model->action_free(action);
+ return surf_network_model->action_unref(action);
else if (action->model_type == surf_cpu_model)
- return surf_cpu_model->action_free(action);
+ return surf_cpu_model->action_unref(action);
else if (action->model_type == surf_workstation_model)
return parallel_action_free(action);
else
return 0;
}
-static void action_use(surf_action_t action)
+static void action_ref(surf_action_t action)
{
if (action->model_type == surf_network_model)
- surf_network_model->action_use(action);
+ surf_network_model->action_ref(action);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->action_use(action);
+ surf_cpu_model->action_ref(action);
else if (action->model_type == surf_workstation_model)
parallel_action_use(action);
else
return;
}
-static void action_change_state(surf_action_t action,
+static void ws_action_state_set(surf_action_t action,
e_surf_action_state_t state)
{
if (action->model_type == surf_network_model)
- surf_network_model->action_change_state(action, state);
+ surf_network_model->action_state_set(action, state);
else if (action->model_type == surf_cpu_model)
- surf_cpu_model->action_change_state(action, state);
+ surf_cpu_model->action_state_set(action, state);
else if (action->model_type == surf_workstation_model)
- surf_action_change_state(action, state);
+ surf_action_state_set(action, state);
else
DIE_IMPOSSIBLE;
return;
static surf_action_t execute(void *workstation, double size)
{
- return surf_cpu_model->extension.cpu.
- execute(((workstation_CLM03_t) workstation)->cpu, size);
+ return surf_cpu_model->extension.
+ cpu.execute(((workstation_CLM03_t) workstation)->cpu, size);
}
static surf_action_t action_sleep(void *workstation, double duration)
{
- return surf_cpu_model->extension.cpu.
- sleep(((workstation_CLM03_t) workstation)->cpu, duration);
+ return surf_cpu_model->extension.
+ cpu.sleep(((workstation_CLM03_t) workstation)->cpu, duration);
}
static void action_suspend(surf_action_t action)
void *workstation_dst, double size,
double rate)
{
- return surf_network_model->extension.network.
- communicate(((workstation_CLM03_t) workstation_src)->network_card,
- ((workstation_CLM03_t) workstation_dst)->network_card, size,
- rate);
+ return surf_network_model->extension.
+ network.communicate(((workstation_CLM03_t) workstation_src)->network_card,
+ ((workstation_CLM03_t) workstation_dst)->network_card,
+ size, rate);
}
static e_surf_cpu_state_t get_state(void *workstation)
{
- return surf_cpu_model->extension.cpu.
- get_state(((workstation_CLM03_t) workstation)->cpu);
+ return surf_cpu_model->extension.
+ cpu.get_state(((workstation_CLM03_t) workstation)->cpu);
}
static double get_speed(void *workstation, double load)
{
- return surf_cpu_model->extension.cpu.
- get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+ return surf_cpu_model->extension.
+ cpu.get_speed(((workstation_CLM03_t) workstation)->cpu, load);
}
static double get_available_speed(void *workstation)
{
- return surf_cpu_model->extension.cpu.
- get_available_speed(((workstation_CLM03_t)
- workstation)->cpu);
+ return surf_cpu_model->extension.
+ cpu.get_available_speed(((workstation_CLM03_t)
+ workstation)->cpu);
}
static xbt_dict_t get_properties(void *workstation)
{
- return surf_cpu_model->
- get_properties(((workstation_CLM03_t) workstation)->cpu);
+ return surf_cpu_model->get_properties(((workstation_CLM03_t) workstation)->
+ cpu);
}
static surf_action_t execute_parallel_task(int workstation_nb,
{
workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
- return surf_network_model->extension.network.
- get_route(workstation_src->network_card, workstation_dst->network_card);
+ return surf_network_model->extension.network.get_route(workstation_src->
+ network_card,
+ workstation_dst->
+ network_card);
}
static int get_route_size(void *src, void *dst)
{
workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
- return surf_network_model->extension.network.
- get_route_size(workstation_src->network_card,
- workstation_dst->network_card);
-}
-
-static const char *get_link_name(const void *link)
-{
- return surf_network_model->extension.network.get_link_name(link);
+ return surf_network_model->extension.
+ network.get_route_size(workstation_src->network_card,
+ workstation_dst->network_card);
}
static double get_link_bandwidth(const void *link)
static void finalize(void)
{
surf_model_exit(surf_workstation_model);
-
- free(surf_workstation_model);
surf_workstation_model = NULL;
}
static void surf_workstation_model_init_internal(void)
{
- surf_workstation_model = xbt_new0(s_surf_model_t, 1);
+ surf_workstation_model = surf_model_init();
- surf_model_init(surf_workstation_model);
-/* surf_workstation_model->extension_private = xbt_new0(s_surf_workstation_model_extension_private_t,1); */
-
- surf_workstation_model->get_resource_name = get_resource_name;
- 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->action_free = action_free;
- surf_workstation_model->action_use = action_use;
- surf_workstation_model->action_cancel = action_cancel;
- surf_workstation_model->action_change_state = action_change_state;
- surf_workstation_model->action_set_data = surf_action_set_data;
surf_workstation_model->name = "Workstation";
+ surf_workstation_model->action_unref = action_unref;
+ surf_workstation_model->action_ref = action_ref;
+ surf_workstation_model->action_cancel = action_cancel;
+ surf_workstation_model->action_state_set = ws_action_state_set;
surf_workstation_model->model_private->resource_used = resource_used;
surf_workstation_model->model_private->share_resources = share_resources;
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 =
