X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e63236e9e8efbc71cd2a0ab87a985b7175a7f37..56f333204e077d4dcbd708be98107ccc26990b95:/src/instr/instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index 66db82ddae..87e0911e34 100644
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -11,18 +11,8 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 
-static xbt_dict_t resource_variables;   /* (host|link)#variable -> value */
-
-/* to trace gtnets */
-static xbt_dict_t gtnets_src;   /* %p (action) -> %s */
-static xbt_dict_t gtnets_dst;   /* %p (action) -> %s */
-
 void TRACE_surf_alloc(void)
 {
-  resource_variables = xbt_dict_new();
-  gtnets_src = xbt_dict_new();
-  gtnets_dst = xbt_dict_new();
-
   TRACE_surf_resource_utilization_alloc();
 }
 
@@ -37,111 +27,67 @@ static void TRACE_surf_set_resource_variable(double date,
                                              const char *resource,
                                              double value)
 {
-  char aux[100], key[100];
-  char *last_value = NULL;
-  if (!TRACE_is_active())
-    return;
-  snprintf(aux, 100, "%f", value);
-  snprintf(key, 100, "%s#%s", resource, variable);
-
-  last_value = xbt_dict_get_or_null(resource_variables, key);
-  if (last_value) {
-    if (atof(last_value) == value) {
-      return;
-    }
-  }
-  pajeSetVariable(date, variable, resource, aux);
-  xbt_dict_set(resource_variables, xbt_strdup(key), xbt_strdup(aux),
-               xbt_free);
+  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;
-  TRACE_surf_set_resource_variable(date, "power", resource, power);
+
+  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);
 }
 
-void TRACE_surf_link_set_bandwidth(double date, void *link,
-                                   double bandwidth)
+void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
 {
   if (!TRACE_is_active())
     return;
-  if (!TRACE_surf_link_is_traced(link))
-    return;
 
-  char resource[100];
-  snprintf(resource, 100, "%p", link);
-  TRACE_surf_set_resource_variable(date, "bandwidth", resource, bandwidth);
+  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);
 }
 
-void TRACE_surf_link_set_latency(double date, void *link, double latency)
+//FIXME: this function is not used (latency availability traces support exists in surf network models?)
+void TRACE_surf_link_set_latency(double date, const char *resource, double latency)
 {
   if (!TRACE_is_active())
     return;
-  if (!TRACE_surf_link_is_traced(link))
-    return;
 
-  char resource[100];
-  snprintf(resource, 100, "%p", link);
-  TRACE_surf_set_resource_variable(date, "latency", resource, latency);
+  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);
 }
 
 /* to trace gtnets */
 void TRACE_surf_gtnets_communicate(void *action, int src, int dst)
 {
-  char key[100], aux[100];
-  if (!TRACE_is_active())
-    return;
-  snprintf(key, 100, "%p", action);
-
-  snprintf(aux, 100, "%d", src);
-  xbt_dict_set(gtnets_src, key, xbt_strdup(aux), xbt_free);
-  snprintf(aux, 100, "%d", dst);
-  xbt_dict_set(gtnets_dst, key, xbt_strdup(aux), xbt_free);
+  xbt_die ("gtnets tracing is to be udpated");
 }
 
 int TRACE_surf_gtnets_get_src(void *action)
 {
-  char key[100];
-  char *aux = NULL;
-  if (!TRACE_is_active())
-    return -1;
-  snprintf(key, 100, "%p", action);
-
-  aux = xbt_dict_get_or_null(gtnets_src, key);
-  if (aux) {
-    return atoi(aux);
-  } else {
-    return -1;
-  }
+  xbt_die ("gtnets tracing is to be udpated");
 }
 
 int TRACE_surf_gtnets_get_dst(void *action)
 {
-  char key[100];
-  char *aux = NULL;
-  if (!TRACE_is_active())
-    return -1;
-  snprintf(key, 100, "%p", action);
-
-  aux = xbt_dict_get_or_null(gtnets_dst, key);
-  if (aux) {
-    return atoi(aux);
-  } else {
-    return -1;
-  }
+  xbt_die ("gtnets tracing is to be udpated");
 }
 
 void TRACE_surf_gtnets_destroy(void *action)
 {
-  char key[100];
-  if (!TRACE_is_active())
-    return;
-  snprintf(key, 100, "%p", action);
-  xbt_dict_remove(gtnets_src, key);
-  xbt_dict_remove(gtnets_dst, key);
+  xbt_die ("gtnets tracing is to be udpated");
 }
 
 void TRACE_surf_action(surf_action_t surf_action, const char *category)