graphicator re-implemented

[simgrid.git] / src / instr / instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index a96568e..33c122b 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -22,7 +22,7 @@ void TRACE_category_with_color (const char *category, const char *color)
   if (!(TRACE_is_active() && category != NULL))
     return;
 
   if (!(TRACE_is_active() && category != NULL))
     return;
 

-  xbt_assert1 (instr_platform_traced(),
+  xbt_assert (instr_platform_traced(),

       "%s must be called after environment creation", __FUNCTION__);
 
   //check if category is already created
       "%s must be called after environment creation", __FUNCTION__);
 
   //check if category is already created


@@ -96,7 +96,7 @@ void TRACE_user_link_variable(double time, const char *resource,
   if (!TRACE_is_active())
     return;
 
   if (!TRACE_is_active())
     return;
 

-  xbt_assert1 (instr_platform_traced(),
+  xbt_assert (instr_platform_traced(),

       "%s must be called after environment creation", __FUNCTION__);
 
   char valuestr[100];
       "%s must be called after environment creation", __FUNCTION__);
 
   char valuestr[100];


@@ -123,7 +123,7 @@ void TRACE_user_host_variable(double time, const char *variable,
   if (!TRACE_is_active())
     return;
 
   if (!TRACE_is_active())
     return;
 

-  xbt_assert1 (instr_platform_traced(),
+  xbt_assert (instr_platform_traced(),

       "%s must be called after environment creation", __FUNCTION__);
 
   char valuestr[100];
       "%s must be called after environment creation", __FUNCTION__);
 
   char valuestr[100];


@@ -145,4 +145,19 @@ void TRACE_user_host_variable(double time, const char *variable,
   }
 }
 
   }
 }
 

+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)
+{
+  if (!TRACE_is_active())
+    return NULL;
+
+  return instr_routing_platform_graph ();
+}
+

 #endif /* HAVE_TRACING */
 #endif /* HAVE_TRACING */