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

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index 4318df001c..73926c9050 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,7 +24,7 @@ void TRACE_surf_release(void)
 
 void TRACE_surf_host_set_power(double date, const char *resource, double power)
 {
-  if (!TRACE_is_active())
+  if (!TRACE_is_enabled())
     return;
 
   container_t container = getContainerByName(resource);
@@ -33,7 +34,7 @@ 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())
+  if (!TRACE_is_enabled())
     return;
 
   container_t container = getContainerByName(resource);
@@ -44,7 +45,7 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
 //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())
+  if (!TRACE_is_enabled())
     return;
 
   container_t container = getContainerByName(resource);
@@ -53,27 +54,23 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten
 }
 
 /* to trace gtnets */
-void TRACE_surf_gtnets_communicate(void *action, int src, int dst)
+void TRACE_surf_gtnets_communicate(void *action, const char *src, const char *dst)
 {
-}
-
-int TRACE_surf_gtnets_get_src(void *action)
-{
-  return -1;
-}
-
-int TRACE_surf_gtnets_get_dst(void *action)
-{
-  return -1;
+  surf_action_network_GTNETS_t gtnets_action = (surf_action_network_GTNETS_t)action;
+  gtnets_action->src_name = xbt_strdup (src);
+  gtnets_action->dst_name = xbt_strdup (dst);
 }
 
 void TRACE_surf_gtnets_destroy(void *action)
 {
+  surf_action_network_GTNETS_t gtnets_action = (surf_action_network_GTNETS_t)action;
+  xbt_free (gtnets_action->src_name);
+  xbt_free (gtnets_action->dst_name);
 }
 
 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;