X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78aa51887c68ebffc0a7e2418e1105a5baa41c1c..f0e89ec6fd6ecb2a6171da22d3ccc88a24cf5ba1:/include/instr/instr.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index a4b5a645ed..29facc4ea4 100644
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -21,15 +21,19 @@
  */
 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);
+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_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color);
+XBT_PUBLIC(void) TRACE_declare_mark_value (const char *mark_type, const char *mark_value);
 XBT_PUBLIC(void) TRACE_mark(const char *mark_type, const char *mark_value);
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_marks (void);
 
 /*
  * Function used by graphicator (transform a SimGrid platform
@@ -40,15 +44,28 @@ XBT_PUBLIC(int) TRACE_platform_graph_export_graphviz (const char *filename);
 /*
  * User-variables related functions
  */
+/* for VM variables */
+XBT_PUBLIC(void) TRACE_vm_variable_declare (const char *variable);
+XBT_PUBLIC(void) TRACE_vm_variable_declare_with_color (const char *variable, const char *color);
+XBT_PUBLIC(void) TRACE_vm_variable_set (const char *vm, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_vm_variable_add (const char *vm, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_vm_variable_sub (const char *vm, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_vm_variable_set_with_time (double time, const char *vm, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_vm_variable_add_with_time (double time, const char *vm, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_vm_variable_sub_with_time (double time, const char *vm, const char *variable, double value);
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_vm_variables (void);
+
+
 /* 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);
@@ -67,20 +84,44 @@ 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);
+XBT_PUBLIC(void) TRACE_host_state_declare (const char *state);
+XBT_PUBLIC(void) TRACE_host_state_declare_value (const char *state, const char *value, const char *color);
+XBT_PUBLIC(void) TRACE_host_set_state (const char *host, const char *state, const char *value);
+XBT_PUBLIC(void) TRACE_host_push_state (const char *host, const char *state, const char *value);
+XBT_PUBLIC(void) TRACE_host_pop_state (const char *host, const char *state);
+XBT_PUBLIC(void) TRACE_host_reset_state (const char *host, const char *state);
+
+/* for creating graph configuration files for Viva by hand */
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_node_types (void);
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_edge_types (void);
+XBT_PUBLIC(void) TRACE_pause (void);
+XBT_PUBLIC(void) TRACE_resume (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_platform_graph_export_graphviz(filename)
 
+#define TRACE_vm_variable_declare(var)
+#define TRACE_vm_variable_declare_with_color(var,color)
+#define TRACE_vm_variable_set(vm,var,value)
+#define TRACE_vm_variable_add(vm,var,value)
+#define TRACE_vm_variable_sub(vm,var,value)
+#define TRACE_vm_variable_set_with_time(time,vm,var,value)
+#define TRACE_vm_variable_add_with_time(time,vm,var,value)
+#define TRACE_vm_variable_sub_with_time(time,vm,var,value)
+#define TRACE_get_vm_variables()
+
 #define TRACE_host_variable_declare(var)
 #define TRACE_host_variable_declare_with_color(var,color)
 #define TRACE_host_variable_set(host,var,value)
@@ -89,6 +130,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)
@@ -105,6 +147,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 */