bugfix revealed by making maxmin_system private...

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

diff --git a/src/surf/network.c b/src/surf/network.c
index b09769e..ca825ae 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -229,15 +229,15 @@ static void *name_service(const char *name)
   return card;
 }
 
-static const char *get_model_name(void *model_id)
+static const char *get_resource_name(void *resource_id)
 {
-  return ((network_card_CM02_t) model_id)->name;
+  return ((network_card_CM02_t) resource_id)->name;
 }
 
-static int model_used(void *model_id)
+static int resource_used(void *resource_id)
 {
   return lmm_constraint_used(network_maxmin_system,
-                            ((network_link_CM02_t) model_id)->
+                            ((network_link_CM02_t) resource_id)->
                             constraint);
 }
 
@@ -283,7 +283,7 @@ static void action_change_state(surf_action_t action,
   return;
 }
 
-static double share_models(double now)
+static double share_resources(double now)
 {
   s_surf_action_network_CM02_t s_action;
   surf_action_network_CM02_t action = NULL;
@@ -291,7 +291,7 @@ static double share_models(double now)
       surf_network_model->common_public->states.running_action_set;
   double min;
 
-  min = generic_maxmin_share_models2(running_actions,
+  min = generic_maxmin_share_resources2(running_actions,
                                        xbt_swag_offset(s_action,
                                                        variable),
                                        network_maxmin_system,
@@ -371,7 +371,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)
 {
@@ -490,7 +490,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
       lmm_update_variable_bound(network_maxmin_system, action->variable,
                                action->rate);
   }
-  lmm_update_variable_latency(maxmin_system, action->variable,
+  lmm_update_variable_latency(network_maxmin_system, action->variable,
                              action->latency);
 
   for (i = 0; i < route_size; i++)
@@ -616,8 +616,8 @@ static void surf_network_model_init_internal(void)
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
   surf_network_model->common_public->name_service = name_service;
-  surf_network_model->common_public->get_model_name =
-      get_model_name;
+  surf_network_model->common_public->get_resource_name =
+      get_resource_name;
   surf_network_model->common_public->action_get_state =
       surf_action_get_state;
   surf_network_model->common_public->action_get_start_time =
@@ -634,12 +634,12 @@ static void surf_network_model_init_internal(void)
       surf_action_set_data;
   surf_network_model->common_public->name = "network";
 
-  surf_network_model->common_private->model_used = model_used;
-  surf_network_model->common_private->share_models = share_models;
+  surf_network_model->common_private->resource_used = resource_used;
+  surf_network_model->common_private->share_resources = share_resources;
   surf_network_model->common_private->update_actions_state =
       update_actions_state;
-  surf_network_model->common_private->update_model_state =
-      update_model_state;
+  surf_network_model->common_private->update_resource_state =
+      update_resource_state;
   surf_network_model->common_private->finalize = finalize;
 
   surf_network_model->common_public->suspend = action_suspend;