X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d019fdca740ed341fdbd5e3f07d098ee8ddcbb0..2e6458d139c6e634715f1310977c85328756b566:/include/instr/instr.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 3daca52383..da7491c558 100644
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -21,36 +21,35 @@
  */
 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(xbt_dynar_t) TRACE_get_categories (void);
 XBT_PUBLIC(void) TRACE_smpi_set_category(const char *category);
-XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task, const char *category);
 
 /*
  * Functions to manage tracing marks (used for trace comparison experiments)
  */
 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(xbt_dynar_t) TRACE_get_marks (void);
 
 /*
- * Functions used by graphicator (transform a SimGrid platform
+ * Function 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);
+XBT_PUBLIC(int) TRACE_platform_graph_export_graphviz (const char *filename);
 
 /*
  * User-variables related functions
  */
 /* for host variables */
-XBT_PUBLIC(void) TRACE_host_variable_declare (const char *var);
-XBT_PUBLIC(void) TRACE_host_variable_declare_with_color (const char *var, const char *color);
+XBT_PUBLIC(void) TRACE_host_variable_declare (const char *variable);
+XBT_PUBLIC(void) TRACE_host_variable_declare_with_color (const char *variable, const char *color);
 XBT_PUBLIC(void) TRACE_host_variable_set (const char *host, const char *variable, double value);
 XBT_PUBLIC(void) TRACE_host_variable_add (const char *host, const char *variable, double value);
 XBT_PUBLIC(void) TRACE_host_variable_sub (const char *host, const char *variable, double value);
 XBT_PUBLIC(void) TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value);
 XBT_PUBLIC(void) TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value);
 XBT_PUBLIC(void) TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value);
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_host_variables (void);
 
 /* for link variables */
 XBT_PUBLIC(void) TRACE_link_variable_declare (const char *var);
@@ -69,21 +68,24 @@ XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub (const char *src, const char *ds
 XBT_PUBLIC(void) TRACE_link_srcdst_variable_set_with_time (double time, const char *src, const char *dst, const char *variable, double value);
 XBT_PUBLIC(void) TRACE_link_srcdst_variable_add_with_time (double time, const char *src, const char *dst, const char *variable, double value);
 XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, const char *dst, const char *variable, double value);
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_link_variables (void);
+
+/* for creating graph configuration files for Triva by hand */
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_node_types (void);
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_edge_types (void);
 
 #else                           /* HAVE_TRACING */
 
 #define TRACE_category(category)
 #define TRACE_category_with_color(category,color)
-#define TRACE_msg_set_task_category(task,category)
+#define TRACE_get_categories()
 #define TRACE_smpi_set_category(category)
-#define TRACE_sd_set_task_category(task,category)
 
 #define TRACE_declare_mark(mark_type)
 #define TRACE_mark(mark_type,mark_value)
+#define TRACE_get_marks()
 
-#define TRACE_node_name(node)
-#define TRACE_platform_graph(void)
-#define TRACE_platform_graph_export_graphviz(g,filename)
+#define TRACE_platform_graph_export_graphviz(filename)
 
 #define TRACE_host_variable_declare(var)
 #define TRACE_host_variable_declare_with_color(var,color)
@@ -93,6 +95,7 @@ XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub_with_time (double time, const ch
 #define TRACE_host_variable_set_with_time(time,host,var,value)
 #define TRACE_host_variable_add_with_time(time,host,var,value)
 #define TRACE_host_variable_sub_with_time(time,host,var,value)
+#define TRACE_get_host_variables()
 
 #define TRACE_link_variable_declare(var)
 #define TRACE_link_variable_declare_with_color(var,color)
@@ -109,6 +112,10 @@ XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub_with_time (double time, const ch
 #define TRACE_link_srcdst_variable_set_with_time(time,src,dst,var,value)
 #define TRACE_link_srcdst_variable_add_with_time(time,src,dst,var,value)
 #define TRACE_link_srcdst_variable_sub_with_time(time,src,dst,var,value)
+#define TRACE_get_host_variables()
+
+#define TRACE_get_node_types()
+#define TRACE_get_edge_types()
 
 #endif                          /* HAVE_TRACING */