X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27522f54798d48ca54ec41a4d203f650cbfacdfd..8ff5bf2dd1f24171fdfeee8bca4853bed5878c98:/src/instr/instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index 9db0eb1fca..9faf3a89fc 100644
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -6,162 +6,51 @@
 
 #include "instr/instr_private.h"
 #include "surf/surf_private.h"
+#include "surf/network_gtnets_private.h"
 
 #ifdef HAVE_TRACING
 
 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();
 }
 
 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)
+void TRACE_surf_host_set_power(double date, const char *resource, double power)
 {
-  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;
-    }
+  if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get ("power", container->type);
+    new_pajeSetVariable(date, container, type, power);
   }
-  pajeSetVariable(date, variable, resource, aux);
-  xbt_dict_set(resource_variables, xbt_strdup(key), xbt_strdup(aux),
-               xbt_free);
 }
 
-void TRACE_surf_host_set_power(double date, const char *resource,
-                               double power)
+void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
 {
-  if (!TRACE_is_active())
-    return;
-  TRACE_surf_set_resource_variable(date, "power", resource, power);
-}
-
-void TRACE_surf_link_set_bandwidth(double date, void *link,
-                                   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);
-}
-
-void TRACE_surf_link_set_latency(double date, void *link, 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);
-}
-
-/* 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);
-}
-
-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;
-  }
-}
-
-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;
+  if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get ("bandwidth", container->type);
+    new_pajeSetVariable(date, container, type, bandwidth);
   }
 }
 
-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);
-}
-
-void TRACE_surf_host_vivaldi_parse(char *host, double x, double y,
-                                   double h)
+/* to trace gtnets */
+void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst)
 {
-  char valuestr[100];
-  if (!TRACE_is_active() || !TRACE_platform_is_enabled())
-    return;
-
-  snprintf(valuestr, 100, "%g", x);
-  pajeSetVariable(0, "vivaldi_x", host, valuestr);
-  snprintf(valuestr, 100, "%g", y);
-  pajeSetVariable(0, "vivaldi_y", host, valuestr);
-  snprintf(valuestr, 100, "%g", h);
-  pajeSetVariable(0, "vivaldi_h", host, valuestr);
+  surf_action_network_GTNETS_t gtnets_action = (surf_action_network_GTNETS_t)action;
+  gtnets_action->src = src;
+  gtnets_action->dst = dst;
 }
 
 void TRACE_surf_action(surf_action_t surf_action, const char *category)
 {
-  if (!TRACE_is_active())
+  if (!TRACE_is_enabled())
     return;
   if (!TRACE_categorized ())
     return;