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

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 6764728..dd23290 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -18,9 +18,8 @@ static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL;
 
 static void cpu_free(void *cpu)
 {
-  free(((cpu_Cas01_t) cpu)->name);
   xbt_dict_free(&(((cpu_Cas01_t) cpu)->properties));
-  free(cpu);
+  surf_resource_free(cpu);
 }
 
 static cpu_Cas01_t cpu_new(char *name, double power_scale,
@@ -33,8 +32,8 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
   cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
   xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name),
               "Host '%s' declared several times in the platform file", name);
-  cpu->model = surf_cpu_model;
-  cpu->name = name;
+  cpu->generic_resource.model = surf_cpu_model;
+  cpu->generic_resource.name = name;
   cpu->power_scale = power_scale;
   xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
   cpu->power_current = power_initial;
@@ -129,11 +128,6 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
 }
 
-static const char *get_resource_name(void *resource_id)
-{
-  return ((cpu_Cas01_t) resource_id)->name;
-}
-
 static int resource_used(void *resource_id)
 {
   return lmm_constraint_used(cpu_maxmin_system,
@@ -161,11 +155,11 @@ static void action_use(surf_action_t action)
 
 static void action_cancel(surf_action_t action)
 {
-  surf_action_change_state(action, SURF_ACTION_FAILED);
+  surf_action_state_set(action, SURF_ACTION_FAILED);
   return;
 }
 
-static void action_change_state(surf_action_t action,
+static void cpu_action_state_set(surf_action_t action,
                                 e_surf_action_state_t state)
 {
 /*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
@@ -174,15 +168,15 @@ static void action_change_state(surf_action_t action,
 /*       ((surf_action_cpu_Cas01_t)action)->variable = NULL; */
 /*     } */
 
-  surf_action_change_state(action, state);
+  surf_action_state_set(action, state);
   return;
 }
 
 static double share_resources(double now)
 {
   s_surf_action_cpu_Cas01_t action;
-  return generic_maxmin_share_resources(surf_cpu_model->
-                                        states.running_action_set,
+  return generic_maxmin_share_resources(surf_cpu_model->states.
+                                        running_action_set,
                                         xbt_swag_offset(action, variable),
                                         cpu_maxmin_system, lmm_solve);
 }
@@ -205,11 +199,11 @@ static void update_actions_state(double now, double delta)
     if ((action->generic_action.remains <= 0) &&
         (lmm_get_variable_weight(action->variable) > 0)) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
                (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -239,11 +233,11 @@ static void update_resource_state(void *id,
       while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) {
         surf_action_t action = lmm_variable_id(var);
 
-        if (surf_action_get_state(action) == SURF_ACTION_RUNNING ||
-            surf_action_get_state(action) == SURF_ACTION_READY ||
-            surf_action_get_state(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+        if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
+            surf_action_state_get(action) == SURF_ACTION_READY ||
+            surf_action_state_get(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) {
           action->finish = date;
-          action_change_state(action, SURF_ACTION_FAILED);
+          cpu_action_state_set(action, SURF_ACTION_FAILED);
         }
       }
     }
@@ -390,35 +384,27 @@ static void finalize(void)
   cpu_maxmin_system = NULL;
 
   surf_model_exit(surf_cpu_model);
+  surf_cpu_model = NULL;
 
   xbt_swag_free(running_action_set_that_does_not_need_being_checked);
   running_action_set_that_does_not_need_being_checked = NULL;
-
-  free(surf_cpu_model);
-  surf_cpu_model = NULL;
 }
 
 static void surf_cpu_model_init_internal(void)
 {
   s_surf_action_t action;
 
-  surf_cpu_model = xbt_new0(s_surf_model_t, 1);
-
-  surf_model_init(surf_cpu_model);
+  surf_cpu_model = surf_model_init();
 
   running_action_set_that_does_not_need_being_checked =
     xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
-  surf_cpu_model->get_resource_name = get_resource_name;
-  surf_cpu_model->action_get_state = surf_action_get_state;
-  surf_cpu_model->action_get_start_time = surf_action_get_start_time;
-  surf_cpu_model->action_get_finish_time = surf_action_get_finish_time;
+  surf_cpu_model->name = "CPU";
+
   surf_cpu_model->action_free = action_free;
   surf_cpu_model->action_use = action_use;
   surf_cpu_model->action_cancel = action_cancel;
-  surf_cpu_model->action_change_state = action_change_state;
-  surf_cpu_model->action_set_data = surf_action_set_data;
-  surf_cpu_model->name = "CPU";
+  surf_cpu_model->action_state_set = cpu_action_state_set;
 
   surf_cpu_model->model_private->resource_used = resource_used;
   surf_cpu_model->model_private->share_resources = share_resources;