Rename some model methods to stick to getters/setters naming standards; further facto...

[simgrid.git] / src / surf / workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 5db137d..bedebf2 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -17,24 +17,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
 
 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;
 }
@@ -54,11 +48,6 @@ void create_workstations(void)
   }
 }
 
-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 */
@@ -118,15 +107,15 @@ static void action_cancel(surf_action_t action)
   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;
@@ -275,11 +264,6 @@ static int get_route_size(void *src, void *dst)
                            workstation_dst->network_card);
 }
 
-static const char *get_link_name(const void *link)
-{
-  return surf_network_model->extension.network.get_link_name(link);
-}
-
 static double get_link_bandwidth(const void *link)
 {
   return surf_network_model->extension.network.get_link_bandwidth(link);
@@ -304,19 +288,12 @@ static void finalize(void)
 static void surf_workstation_model_init_internal(void)
 {
   surf_workstation_model = surf_model_init();
-/*   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->name = "Workstation";
   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_state_set = ws_action_state_set;
 
   surf_workstation_model->model_private->resource_used = resource_used;
   surf_workstation_model->model_private->share_resources = share_resources;
@@ -348,7 +325,6 @@ static void surf_workstation_model_init_internal(void)
   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 =