X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3a5b32a673e51a66c380cb2722893e0a298944c..8e06878d622c1792c5e7d8d2d412241b53004e37:/include/instr/instr.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 45a3366d99..9a9a8d688e 100644
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -12,6 +12,7 @@
 #ifdef HAVE_TRACING
 
 #include "xbt.h"
+#include "xbt/graph.h"
 #include "msg/msg.h"
 #include "simdag/simdag.h"
 
@@ -19,16 +20,16 @@ XBT_PUBLIC(void) TRACE_category(const char *category);
 XBT_PUBLIC(void) TRACE_category_with_color (const char *category, const char *color);
 XBT_PUBLIC(void) TRACE_msg_set_task_category(m_task_t task,
                                              const char *category);
-XBT_PUBLIC(void) TRACE_msg_set_process_category(m_process_t process,
-                                                const char *category);
-XBT_PUBLIC(void) TRACE_set_mask(int mask);
+void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color);
 XBT_PUBLIC(void) TRACE_user_host_variable(double time,
                                           const char *variable,
                                           double value, const char *what);
-XBT_PUBLIC(void) TRACE_user_link_variable(double time, const char *src,
-                                          const char *dst,
-                                          const char *variable,
-                                          double value, const char *what);
+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);
+XBT_PUBLIC(void) TRACE_user_link_variable(double time, const char *resource,
+                              const char *variable,
+                              double value, const char *what);
 XBT_PUBLIC(void) TRACE_declare_mark(const char *mark_type);
 XBT_PUBLIC(void) TRACE_mark(const char *mark_type, const char *mark_value);
 XBT_PUBLIC(void) TRACE_smpi_set_category(const char *category);
@@ -57,32 +58,32 @@ XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task,
 	TRACE_user_host_variable(MSG_get_clock(),var,value,"sub");
 
 #define TRACE_link_variable_declare(var) \
-	TRACE_user_link_variable(0,NULL,NULL,var,0,"declare");
+	TRACE_user_link_variable(0,NULL,var,0,"declare");
 
-#define TRACE_link_variable_set_with_time(time,src,dst,var,value) \
-	TRACE_user_link_variable(time,src,dst,var,value,"set");
+#define TRACE_link_variable_set_with_time(time,link,var,value) \
+	TRACE_user_link_variable(time,link,var,value,"set");
 
-#define TRACE_link_variable_add_with_time(time,src,dst,var,value) \
-	TRACE_user_link_variable(time,src,dst,var,value,"add");
+#define TRACE_link_variable_add_with_time(time,link,var,value) \
+	TRACE_user_link_variable(time,link,var,value,"add");
 
-#define TRACE_link_variable_sub_with_time(time,src,dst,var,value) \
-	TRACE_user_link_variable(time,src,dst,var,value,"sub");
+#define TRACE_link_variable_sub_with_time(time,link,var,value) \
+	TRACE_user_link_variable(time,link,var,value,"sub");
 
-#define TRACE_link_variable_set(src,dst,var,value) \
-	TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"set");
+#define TRACE_link_variable_set(link,var,value) \
+	TRACE_user_link_variable(MSG_get_clock(),link,var,value,"set");
 
-#define TRACE_link_variable_add(src,dst,var,value) \
-	TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"add");
+#define TRACE_link_variable_add(link,var,value) \
+	TRACE_user_link_variable(MSG_get_clock(),link,var,value,"add");
 
-#define TRACE_link_variable_sub(src,dst,var,value) \
-	TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"sub");
+#define TRACE_link_variable_sub(link,var,value) \
+	TRACE_user_link_variable(MSG_get_clock(),link,var,value,"sub");
 
 #else                           /* HAVE_TRACING */
 
 #define TRACE_category(cat)
 #define TRACE_category_with_color(cat,color)
 #define TRACE_msg_set_task_category(task,cat)
-#define TRACE_msg_set_process_category(proc,cat)
+#define TRACE_msg_set_process_category(proc,cat,color)
 #define TRACE_set_mask(mask)
 
 #define TRACE_host_variable_declare(var)
@@ -93,12 +94,12 @@ XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task,
 #define TRACE_host_variable_add(var,value)
 #define TRACE_host_variable_sub(var,value)
 #define TRACE_link_variable_declare(var)
-#define TRACE_link_variable_set_with_time(time,src,dst,var,value)
-#define TRACE_link_variable_add_with_time(time,src,dst,var,value)
-#define TRACE_link_variable_sub_with_time(time,src,dst,var,value)
-#define TRACE_link_variable_set(src,dst,var,value)
-#define TRACE_link_variable_add(src,dst,var,value)
-#define TRACE_link_variable_sub(src,dst,var,value)
+#define TRACE_link_variable_set_with_time(time,link,var,value)
+#define TRACE_link_variable_add_with_time(time,link,var,value)
+#define TRACE_link_variable_sub_with_time(time,link,var,value)
+#define TRACE_link_variable_set(link,var,value)
+#define TRACE_link_variable_add(link,var,value)
+#define TRACE_link_variable_sub(link,var,value)
 #define TRACE_declare_mark(type)
 #define TRACE_mark(type,value)
 #define TRACE_smpi_set_category(cat)