[trace] smpi types declaration updated

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

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index f3fe658..cdec2f0 100644 (file)
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -11,12 +11,8 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 
-static xbt_dict_t resource_variables;   /* (host|link)#variable -> value */
-
 void TRACE_surf_alloc(void)
 {
-  resource_variables = xbt_dict_new();
-
   TRACE_surf_resource_utilization_alloc();
 }
 
@@ -33,19 +29,16 @@ 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, resource, value_str);
+  char *variable_type = instr_variable_type(variable, resource);
+  pajeSetVariable(date, variable, variable_type, value_str);
 }
 
-void TRACE_surf_host_set_power(double date, const char *resource,
-                               double power)
+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 = instr_variable_type("power", resource);
   TRACE_surf_set_resource_variable(date, variable_type, resource, power);
 }
 
@@ -54,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 = instr_variable_type("bandwidth", resource);
   TRACE_surf_set_resource_variable(date, variable_type, resource, bandwidth);
 }
 
@@ -67,10 +57,7 @@ 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 = instr_variable_type("latency", resource);
   TRACE_surf_set_resource_variable(date, variable_type, resource, latency);
 }