[trace] changing the interface to write on the tracing file

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

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index cdec2f0e83ca766fabc29f274caa9b29bdc6b739..19a044b7454c0b1e9578750fa42beee66d022ce6 100644 (file)
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -19,7 +19,6 @@ void TRACE_surf_alloc(void)
 void TRACE_surf_release(void)
 {
   TRACE_surf_resource_utilization_release();
-  instr_destroy_platform();
 }
 
 static void TRACE_surf_set_resource_variable(double date,
@@ -27,10 +26,9 @@ static void TRACE_surf_set_resource_variable(double date,
                                              const char *resource,
                                              double value)
 {
-  char value_str[INSTR_DEFAULT_STR_SIZE];
-  snprintf(value_str, 100, "%f", value);
-  char *variable_type = instr_variable_type(variable, resource);
-  pajeSetVariable(date, variable, variable_type, value_str);
+  container_t container = getContainerByName(resource);
+  type_t type = getVariableType(variable, NULL, container->type);
+  new_pajeSetVariable(date, container, type, value);
 }
 
 void TRACE_surf_host_set_power(double date, const char *resource, double power)
@@ -38,7 +36,7 @@ void TRACE_surf_host_set_power(double date, const char *resource, double power)
   if (!TRACE_is_active())
     return;
 
-  char *variable_type = instr_variable_type("power", resource);
+  char *variable_type = getVariableTypeIdByName("power", getContainerByName(resource)->type);
   TRACE_surf_set_resource_variable(date, variable_type, resource, power);
 }
 
@@ -47,7 +45,7 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
   if (!TRACE_is_active())
     return;
 
-  char *variable_type = instr_variable_type("bandwidth", resource);
+  char *variable_type = getVariableTypeIdByName("bandwidth", getContainerByName(resource)->type);
   TRACE_surf_set_resource_variable(date, variable_type, resource, bandwidth);
 }
 
@@ -57,29 +55,27 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten
   if (!TRACE_is_active())
     return;
 
-  char *variable_type = instr_variable_type("latency", resource);
+  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)