[trace] cosmetics

[simgrid.git] / src / instr / instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index bc68f28..b32d089 100644 (file)
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -19,7 +19,7 @@ void TRACE_surf_alloc(void)
 void TRACE_surf_release(void)
 {
   TRACE_surf_resource_utilization_release();
-  instr_destroy_platform();
+  destroyAllContainers();
 }
 
 static void TRACE_surf_set_resource_variable(double date,
@@ -29,7 +29,8 @@ static void TRACE_surf_set_resource_variable(double date,
 {
   char value_str[INSTR_DEFAULT_STR_SIZE];
   snprintf(value_str, 100, "%f", value);
-  pajeSetVariable(date, variable, instr_id(resource), value_str);
+  char *variable_type = getVariableTypeIdByName(variable, getContainerByName(resource)->type);
+  pajeSetVariable(date, variable, variable_type, value_str);
 }
 
 void TRACE_surf_host_set_power(double date, const char *resource, double power)
@@ -37,10 +38,7 @@ void TRACE_surf_host_set_power(double date, const char *resource, double power)
   if (!TRACE_is_active())
     return;
 
-  char *host_type = instr_host_type (resource);
-  char variable_type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "power-%s", host_type);
-
+  char *variable_type = getVariableTypeIdByName("power", getContainerByName(resource)->type);
   TRACE_surf_set_resource_variable(date, variable_type, resource, power);
 }
 
@@ -49,10 +47,7 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
   if (!TRACE_is_active())
     return;
 
-  char *link_type = instr_link_type (resource);
-  char variable_type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "bandwidth-%s", link_type);
-
+  char *variable_type = getVariableTypeIdByName("bandwidth", getContainerByName(resource)->type);
   TRACE_surf_set_resource_variable(date, variable_type, resource, bandwidth);
 }
 
@@ -62,32 +57,27 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten
   if (!TRACE_is_active())
     return;
 
-  char *link_type = instr_link_type (resource);
-  char variable_type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "latency-%s", link_type);
-
+  char *variable_type = getVariableTypeIdByName("latency", getContainerByName(resource)->type);
   TRACE_surf_set_resource_variable(date, variable_type, resource, latency);
 }
 
 /* to trace gtnets */
 void TRACE_surf_gtnets_communicate(void *action, int src, int dst)
 {
-  xbt_die ("gtnets tracing is to be udpated");
 }
 
 int TRACE_surf_gtnets_get_src(void *action)
 {
-  xbt_die ("gtnets tracing is to be udpated");
+  return -1;
 }
 
 int TRACE_surf_gtnets_get_dst(void *action)
 {
-  xbt_die ("gtnets tracing is to be udpated");
+  return -1;
 }
 
 void TRACE_surf_gtnets_destroy(void *action)
 {
-  xbt_die ("gtnets tracing is to be udpated");
 }
 
 void TRACE_surf_action(surf_action_t surf_action, const char *category)