X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/46311148101eae2e8af8aa1d0f7c519de32df899..fd317f3cbf1cafcd1eeb4841b9a4b22d0dc81a0b:/src/instr/instr_surf.c

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index b32d089503..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
 
@@ -19,70 +20,37 @@ void TRACE_surf_alloc(void)
 void TRACE_surf_release(void)
 {
   TRACE_surf_resource_utilization_release();
-  destroyAllContainers();
-}
-
-static void TRACE_surf_set_resource_variable(double date,
-                                             const char *variable,
-                                             const char *resource,
-                                             double value)
-{
-  char value_str[INSTR_DEFAULT_STR_SIZE];
-  snprintf(value_str, 100, "%f", value);
-  char *variable_type = getVariableTypeIdByName(variable, getContainerByName(resource)->type);
-  pajeSetVariable(date, variable, variable_type, value_str);
 }
 
 void TRACE_surf_host_set_power(double date, const char *resource, double power)
 {
-  if (!TRACE_is_active())
-    return;
-
-  char *variable_type = getVariableTypeIdByName("power", getContainerByName(resource)->type);
-  TRACE_surf_set_resource_variable(date, variable_type, resource, 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;
-
-  char *variable_type = getVariableTypeIdByName("bandwidth", getContainerByName(resource)->type);
-  TRACE_surf_set_resource_variable(date, variable_type, resource, 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;
-
-  char *variable_type = getVariableTypeIdByName("latency", getContainerByName(resource)->type);
-  TRACE_surf_set_resource_variable(date, variable_type, resource, 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;