X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cec1bae69722560d255995bfe889d96c92e2ba77..7705e849132559bfd169a04c26296cc22f2d3743:/src/instr/instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index 4318df001c..9faf3a89fc 100644
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -6,6 +6,7 @@
 
 #include "instr/instr_private.h"
 #include "surf/surf_private.h"
+#include "surf/network_gtnets_private.h"
 
 #ifdef HAVE_TRACING
 
@@ -23,57 +24,33 @@ void TRACE_surf_release(void)
 
 void TRACE_surf_host_set_power(double date, const char *resource, double power)
 {
-  if (!TRACE_is_active())
-    return;
-
-  container_t container = getContainerByName(resource);
-  type_t type = getVariableType("power", NULL, container->type);
-  new_pajeSetVariable(date, container, type, power);
+  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);
+  }
 }
 
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
 {
-  if (!TRACE_is_active())
-    return;
-
-  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?)
-void TRACE_surf_link_set_latency(double date, const char *resource, double latency)
-{
-  if (!TRACE_is_active())
-    return;
-
-  container_t container = getContainerByName(resource);
-  type_t type = getVariableType("latency", NULL, container->type);
-  new_pajeSetVariable(date, container, type, latency);
+  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);
+  }
 }
 
 /* to trace gtnets */
-void TRACE_surf_gtnets_communicate(void *action, int src, int dst)
-{
-}
-
-int TRACE_surf_gtnets_get_src(void *action)
-{
-  return -1;
-}
-
-int TRACE_surf_gtnets_get_dst(void *action)
-{
-  return -1;
-}
-
-void TRACE_surf_gtnets_destroy(void *action)
+void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst)
 {
+  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;