X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b05a0ed4f5fb7b81f96777af37b8f7fc5a4bf160..8465282253954c58d16cb5dae9a5d064eada3329:/src/instr/instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 3c06b95d47..7fedc8349f 100644
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -1,14 +1,14 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2014. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid_config.h"
 
-#ifdef HAVE_TRACING
 #include "instr/instr_private.h"
-#include "surf/network_private.h"
+#include "surf/surf.h"
+#include "surf/surf_private.h"
 
 typedef enum {
   INSTR_US_DECLARE,
@@ -111,7 +111,7 @@ void TRACE_category_with_color (const char *category, const char *color)
     snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
   }
 
-  XBT_DEBUG("CAT,declare %s, %s", category, final_color);
+  XBT_DEBUG("CAT,declare %s, \"%s\" \"%s\"", category, color, final_color);
 
   //define the type of this category on top of hosts and links
   instr_new_variable_type (category, final_color);
@@ -374,7 +374,7 @@ static void instr_user_srcdst_variable(double time,
   unsigned int i;
   void *link;
   xbt_dynar_foreach (route, i, link) {
-    char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+    char *link_name = (char*)surf_resource_name(link);
     instr_user_variable (time, link_name, variable, father_type, value, what, NULL, user_link_variables);
   }
 }
@@ -397,7 +397,7 @@ int TRACE_platform_graph_export_graphviz (const char *filename)
   xbt_graph_t g = instr_routing_platform_graph();
   if (g == NULL) return 0;
   instr_routing_platform_graph_export_graphviz (g, filename);
-  xbt_graph_free_graph (g, xbt_free, xbt_free, NULL);
+  xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, NULL);
   return 1;
 }
 
@@ -1163,5 +1163,3 @@ void TRACE_resume (void)
 {
   instr_resume_tracing();
 }
-
-#endif /* HAVE_TRACING */