X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3cf1195550552867acbc2b5846286f825679706..90069d83ac5270136aa713147bee6e691ed3941f:/src/surf/workstation_ptask_L07.c

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 28468d0ecd..fd6967fada 100644
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -80,12 +80,12 @@ static void *name_service(const char *name)
   return xbt_dict_get_or_null(workstation_set, name);
 }
 
-static const char *get_model_name(void *model_id)
+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 network_link_L07_t. However, only cpu_L07_t
      will theoretically be given as an argument here. */
-  return ((cpu_L07_t) model_id)->name;
+  return ((cpu_L07_t) resource_id)->name;
 }
 
 /* action_get_state is inherited from the surf module */
@@ -175,23 +175,23 @@ static void action_set_priority(surf_action_t action, double priority)
 /******* Resource Private    **********/
 /**************************************/
 
-static int model_used(void *model_id)
+static int resource_used(void *resource_id)
 {
   /* We can freely cast as a network_link_L07_t because it has
      the same prefix as cpu_L07_t */
   return lmm_constraint_used(ptask_maxmin_system,
-			     ((network_link_L07_t) model_id)->
+			     ((network_link_L07_t) resource_id)->
 			     constraint);
 
 }
 
-static double share_models(double now)
+static double share_resources(double now)
 {
   s_surf_action_workstation_L07_t s_action;
 
   xbt_swag_t running_actions =
       surf_workstation_model->common_public->states.running_action_set;
-  double min = generic_maxmin_share_models2(running_actions,
+  double min = generic_maxmin_share_resources2(running_actions,
 					       xbt_swag_offset(s_action,
 							       variable),
 					       ptask_maxmin_system,
@@ -274,7 +274,7 @@ static void update_actions_state(double now, double delta)
   return;
 }
 
-static void update_model_state(void *id,
+static void update_resource_state(void *id,
 				  tmgr_trace_event_t event_type,
 				  double value)
 {
@@ -361,7 +361,7 @@ static void finalize(void)
 /******* Resource Private    **********/
 /**************************************/
 
-static e_surf_cpu_state_t model_get_state(void *cpu)
+static e_surf_cpu_state_t resource_get_state(void *cpu)
 {
   return ((cpu_L07_t) cpu)->state_current;
 }
@@ -841,8 +841,8 @@ static void model_init_internal(void)
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
   surf_workstation_model->common_public->name_service = name_service;
-  surf_workstation_model->common_public->get_model_name =
-      get_model_name;
+  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 =
@@ -868,19 +868,19 @@ static void model_init_internal(void)
       action_set_priority;
   surf_workstation_model->common_public->name = "Workstation ptask_L07";
 
-  surf_workstation_model->common_private->model_used = model_used;
-  surf_workstation_model->common_private->share_models =
-      share_models;
+  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 =
       update_actions_state;
-  surf_workstation_model->common_private->update_model_state =
-      update_model_state;
+  surf_workstation_model->common_private->update_resource_state =
+      update_resource_state;
   surf_workstation_model->common_private->finalize = finalize;
 
   surf_workstation_model->extension_public->execute = execute;
   surf_workstation_model->extension_public->sleep = action_sleep;
   surf_workstation_model->extension_public->get_state =
-      model_get_state;
+      resource_get_state;
   surf_workstation_model->extension_public->get_speed = get_speed;
   surf_workstation_model->extension_public->get_available_speed =
       get_available_speed;