[trace] remove function from tracing interface, should be internal

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 3daca52..2da6af8 100644 (file)
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -35,7 +35,6 @@ XBT_PUBLIC(void) TRACE_mark(const char *mark_type, const char *mark_value);
  * Functions used by graphicator (transform a SimGrid platform
  * file in a graphviz dot file with the network topology)
  */
-XBT_PUBLIC(const char *) TRACE_node_name (xbt_node_t node);
 XBT_PUBLIC(xbt_graph_t) TRACE_platform_graph (void);
 XBT_PUBLIC(void) TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);
 
@@ -81,7 +80,6 @@ XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub_with_time (double time, const ch
 #define TRACE_declare_mark(mark_type)
 #define TRACE_mark(mark_type,mark_value)
 
-#define TRACE_node_name(node)
 #define TRACE_platform_graph(void)
 #define TRACE_platform_graph_export_graphviz(g,filename)
 

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index e49403a..4472a82 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -162,12 +162,6 @@ static void instr_user_srcdst_variable(double time,
   }
 }
 
-const char *TRACE_node_name (xbt_node_t node)
-{
-  void *data = xbt_graph_node_get_data(node);
-  char *str = (char*)data;
-  return str;
-}
 
 xbt_graph_t TRACE_platform_graph (void)
 {

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 472183f..b501bd7 100644 (file)
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -18,6 +18,14 @@ extern xbt_dict_t defined_types; /* from instr_interface.c */
 static int platform_created = 0;            /* indicate whether the platform file has been traced */
 static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */
 
+static const char *instr_node_name (xbt_node_t node)
+{
+  void *data = xbt_graph_node_get_data(node);
+  char *str = (char*)data;
+  return str;
+}
+
+
 static container_t lowestCommonAncestor (container_t a1, container_t a2)
 {
   //this is only an optimization (since most of a1 and a2 share the same parent)
@@ -424,8 +432,8 @@ static xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_
   xbt_edge_t ret;
   char *name;
 
-  const char *sn = TRACE_node_name (s);
-  const char *dn = TRACE_node_name (d);
+  const char *sn = instr_node_name (s);
+  const char *dn = instr_node_name (d);
 
   name = bprintf ("%s%s", sn, dn);
   ret = xbt_dict_get_or_null (edges, name);
@@ -546,11 +554,11 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi
           "  node [width=.3, height=.3, style=filled, color=skyblue]\n\n");
 
   xbt_dynar_foreach(g->nodes, cursor, node) {
-    fprintf(file, "  \"%s\";\n", TRACE_node_name(node));
+    fprintf(file, "  \"%s\";\n", instr_node_name(node));
   }
   xbt_dynar_foreach(g->edges, cursor, edge) {
-    const char *src_s = TRACE_node_name (edge->src);
-    const char *dst_s = TRACE_node_name (edge->dst);
+    const char *src_s = instr_node_name (edge->src);
+    const char *dst_s = instr_node_name (edge->dst);
     if (g->directed)
       fprintf(file, "  \"%s\" -> \"%s\";\n", src_s, dst_s);
     else