Merge conflicts in instr_routing.c

[simgrid.git] / include / instr / instr.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index ccd354e..4ed246e 100644 (file)
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -28,6 +28,8 @@ XBT_PUBLIC(void) TRACE_smpi_set_category(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);
 
@@ -40,6 +42,18 @@ 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 *variable);
 XBT_PUBLIC(void) TRACE_host_variable_declare_with_color (const char *variable, const char *color);
@@ -74,10 +88,14 @@ XBT_PUBLIC(void) TRACE_host_state_declare_value (const char *state, const char *
 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 Triva 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 */
 
@@ -92,6 +110,16 @@ XBT_PUBLIC(xbt_dynar_t) TRACE_get_edge_types (void);
 
 #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)