Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

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

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index b32d089..4318df0 100644 (file)
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -19,18 +19,6 @@ void TRACE_surf_alloc(void)
 void TRACE_surf_release(void)
 {
   TRACE_surf_resource_utilization_release();
-  destroyAllContainers();
-}
-
-static void TRACE_surf_set_resource_variable(double date,
-                                             const char *variable,
-                                             const char *resource,
-                                             double value)
-{
-  char value_str[INSTR_DEFAULT_STR_SIZE];
-  snprintf(value_str, 100, "%f", value);
-  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)
@@ -38,8 +26,9 @@ void TRACE_surf_host_set_power(double date, const char *resource, double power)
   if (!TRACE_is_active())
     return;
 
-  char *variable_type = getVariableTypeIdByName("power", getContainerByName(resource)->type);
-  TRACE_surf_set_resource_variable(date, variable_type, resource, power);
+  container_t container = getContainerByName(resource);
+  type_t type = getVariableType("power", NULL, container->type);
+  new_pajeSetVariable(date, container, type, power);
 }
 
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
@@ -47,8 +36,9 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
   if (!TRACE_is_active())
     return;
 
-  char *variable_type = getVariableTypeIdByName("bandwidth", getContainerByName(resource)->type);
-  TRACE_surf_set_resource_variable(date, variable_type, resource, bandwidth);
+  container_t container = getContainerByName(resource);
+  type_t type = getVariableType("bandwidth", NULL, container->type);
+  new_pajeSetVariable(date, container, type, bandwidth);
 }
 
 //FIXME: this function is not used (latency availability traces support exists in surf network models?)
@@ -57,8 +47,9 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten
   if (!TRACE_is_active())
     return;
 
-  char *variable_type = getVariableTypeIdByName("latency", getContainerByName(resource)->type);
-  TRACE_surf_set_resource_variable(date, variable_type, resource, latency);
+  container_t container = getContainerByName(resource);
+  type_t type = getVariableType("latency", NULL, container->type);
+  new_pajeSetVariable(date, container, type, latency);
 }
 
 /* to trace gtnets */