X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd4e84849a0c2d3cf2249933f111d7281c6c23e0..9e0ca3c3610b911e43366c78f4948842db40e084:/src/instr/instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index f3fe65887c..4318df001c 100644
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -11,42 +11,24 @@
 
 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();
 }
 
 void TRACE_surf_release(void)
 {
   TRACE_surf_resource_utilization_release();
-  instr_destroy_platform();
-}
-
-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);
-  pajeSetVariable(date, variable, resource, 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);
-
-  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)
@@ -54,11 +36,9 @@ 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);
-
-  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?)
@@ -67,32 +47,28 @@ 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);
-
-  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 */
 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)