X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5a1db1d0b268cb9ed8f37246fd970fce7631943..5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a:/src/instr/instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index de520c9112..9faf3a89fc 100644
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -24,53 +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, const char *src, const char *dst)
-{
-  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)
+void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst)
 {
   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);
+  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;