-#define TRACE_host_variable_declare(var) \
- TRACE_user_host_variable(0,var,0,"declare");
-
-#define TRACE_host_variable_set_with_time(time,var,value) \
- TRACE_user_host_variable(time,var,value,"set");
-
-#define TRACE_host_variable_add_with_time(time,var,value) \
- TRACE_user_host_variable(time,var,value,"add");
-
-#define TRACE_host_variable_sub_with_time(time,var,value) \
- TRACE_user_host_variable(time,var,value,"sub");
-
-#define TRACE_host_variable_set(var,value) \
- TRACE_user_host_variable(MSG_get_clock(),var,value,"set");
-
-#define TRACE_host_variable_add(var,value) \
- TRACE_user_host_variable(MSG_get_clock(),var,value,"add");
-
-#define TRACE_host_variable_sub(var,value) \
- 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");
-
-#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_add_with_time(time,src,dst,var,value) \
- TRACE_user_link_variable(time,src,dst,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_set(src,dst,var,value) \
- TRACE_user_link_variable(MSG_get_clock(),src,dst,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_sub(src,dst,var,value) \
- TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"sub");
-
-#else /* HAVE_TRACING */
-
-#define TRACE_start()
-#define TRACE_end()
-#define TRACE_category(cat)
-#define TRACE_define_type(cat,supercat,final)
-#define TRACE_create_category(inst,cat)
-#define TRACE_msg_set_task_category(task,cat)
-#define TRACE_msg_set_process_category(proc,cat)
-#define TRACE_set_mask(mask)
+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(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);
+
+/*
+ * 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_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);
+
+/* for link variables */
+XBT_PUBLIC(void) TRACE_link_variable_declare (const char *var);
+XBT_PUBLIC(void) TRACE_link_variable_declare_with_color (const char *var, const char *color);
+XBT_PUBLIC(void) TRACE_link_variable_set (const char *link, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_link_variable_add (const char *link, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_link_variable_sub (const char *link, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value);
+
+/* for link variables, but with src and dst used for get_route */
+XBT_PUBLIC(void) TRACE_link_srcdst_variable_set (const char *src, const char *dst, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_link_srcdst_variable_add (const char *src, const char *dst, const char *variable, double value);
+XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub (const char *src, const char *dst, const char *variable, double value);
+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);
+
+#else /* HAVE_TRACING */
+
+#define TRACE_category(category)
+#define TRACE_category_with_color(category,color)
+#define TRACE_msg_set_task_category(task,category)
+#define TRACE_msg_set_process_category(process,category,color)
+#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_node_name(node)
+#define TRACE_platform_graph(void)
+#define TRACE_platform_graph_export_graphviz(g,filename)