X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..18801754584f9ffc3e7c2407008ac24c0eb57926:/src/surf/instr_surf.c

diff --git a/src/surf/instr_surf.c b/src/surf/instr_surf.c
index f0f3df2493..b0003d6cc5 100644
--- a/src/surf/instr_surf.c
+++ b/src/surf/instr_surf.c
@@ -1,14 +1,11 @@
-/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "instr/instr_private.h"
-#include "surf/surf_private.h"
-//FIXME:#include "surf/network_gtnets_private.h"
-
-#ifdef HAVE_TRACING
+#include "src/instr/instr_private.h"
+#include "src/surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 
@@ -22,12 +19,12 @@ void TRACE_surf_release(void)
   TRACE_surf_resource_utilization_release();
 }
 
-void TRACE_surf_host_set_power(double date, const char *resource, double power)
+void TRACE_surf_host_set_speed(double date, const char *resource, double speed)
 {
   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);
+    new_pajeSetVariable(date, container, type, speed);
   }
 }
 
@@ -40,14 +37,6 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
   }
 }
 
-/* to trace gtnets */
-void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst)
-{
-  /*FIXME: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_enabled())
@@ -59,4 +48,3 @@ void TRACE_surf_action(surf_action_t surf_action, const char *category)
 
   surf_action_set_category(surf_action, category);
 }
-#endif /* HAVE_TRACING */