X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ea75ed937bc712436c752ac8bfb69140800ac18..d7e241de6a9ff3a5fa5866fb535787f12341655a:/src/instr/instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 34d03af197..f409086d80 100644
--- 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;
 
-  xbt_assert1 (instr_platform_traced(),
+  xbt_assert (instr_platform_traced(),
       "%s must be called after environment creation", __FUNCTION__);
 
   //check if category is already created
@@ -42,7 +42,7 @@ void TRACE_category_with_color (const char *category, const char *color)
     snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
   }
 
-  DEBUG2("CAT,declare %s, %s", category, final_color);
+  XBT_DEBUG("CAT,declare %s, %s", category, final_color);
 
 //FIXME
 //  -  if (final) {
@@ -71,7 +71,7 @@ void TRACE_declare_mark(const char *mark_type)
   if (!mark_type)
     return;
 
-  DEBUG1("MARK,declare %s", mark_type);
+  XBT_DEBUG("MARK,declare %s", mark_type);
   getEventType(mark_type, NULL, getRootType());
 }
 
@@ -82,9 +82,10 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
   if (!mark_type || !mark_value)
     return;
 
-  DEBUG2("MARK %s %s", mark_type, mark_value);
+  XBT_DEBUG("MARK %s %s", mark_type, mark_value);
   type_t type = getEventType (mark_type, NULL, getRootContainer()->type);
-  new_pajeNewEvent (MSG_get_clock(), getRootContainer(), type, mark_value);
+  val_t value = getValue (mark_value, NULL, type);
+  new_pajeNewEvent (MSG_get_clock(), getRootContainer(), type, value);
 }
 
 
@@ -95,7 +96,7 @@ void TRACE_user_link_variable(double time, const char *resource,
   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];
@@ -122,7 +123,7 @@ void TRACE_user_host_variable(double time, const char *variable,
   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];
@@ -144,4 +145,24 @@ 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 ();
+}
+
+void TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename)
+{
+  instr_routing_platform_graph_export_graphviz (g, filename);
+}
+
 #endif /* HAVE_TRACING */