renaming the tracing functions that set the host/link utilization

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

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 57355b7..756f780 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -39,7 +39,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   gtnets_link->lat_current = lat;
   gtnets_link->id = link_count;
 #ifdef HAVE_TRACING
-  TRACE_surf_net_link_new (name, bw, lat);
+  TRACE_surf_link_declaration (name, bw, lat);
 #endif
   xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
                surf_resource_free);
@@ -235,10 +235,6 @@ static void update_actions_state(double now, double delta)
       double remain = gtnets_get_flow_rx(action);
 
 #ifdef HAVE_TRACING
-      // tracing surf action
-      TRACE_surf_update_action_state (action, action->generic_action.data,
-                 (action->generic_action.remains-remain)/delta, "BandwidthUsed", now-delta, delta);
-
       // tracing resource utilization
       int src = TRACE_surf_gtnets_get_src (action);
       int dst = TRACE_surf_gtnets_get_dst (action);
@@ -248,7 +244,7 @@ static void update_actions_state(double now, double delta)
         unsigned int i;
         xbt_dynar_foreach(route, i, link) {
 
-          TRACE_surf_update_action_state_net_resource (link->generic_resource.name,
+               TRACE_surf_link_set_utilization (link->generic_resource.name,
             action->generic_action.data, (action->generic_action.remains-remain)/delta, now-delta, delta);
         }
       }