X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/673a25c682fbdedbdefbc513160b2710a5b545fb..ae5ff5ef44f3f731078a8fd8de489d7581ff8c12:/include/instr/instr.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 52b364a714..39cfd596e9 100644
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -15,30 +15,8 @@
 #include "msg/msg.h"
 #include "simdag/simdag.h"
 
-/* Trace error codes (used in exceptions) */
-#define TRACE_ERROR_COMPLEX_ROUTES 100
-#define TRACE_ERROR_TYPE_NOT_DEFINED 200
-#define TRACE_ERROR_TYPE_ALREADY_DEFINED 201
-#define TRACE_ERROR_CATEGORY_NOT_DEFINED 300
-#define TRACE_ERROR_CATEGORY_ALREADY_DEFINED 301
-#define TRACE_ERROR_MASK 400
-#define TRACE_ERROR_FILE_OPEN 401
-#define TRACE_ERROR_START 500
-#define TRACE_ERROR_ALREADY_ACTIVE 501
-
-XBT_PUBLIC(int) TRACE_start(void);
-XBT_PUBLIC(int) TRACE_end(void);
-XBT_PUBLIC(int) TRACE_category(const char *category);
-XBT_PUBLIC(int) TRACE_category_with_color (const char *category, const char *color);
-XBT_PUBLIC(void) TRACE_define_type(const char *type,
-                                   const char *parent_type, int final);
-XBT_PUBLIC(int) TRACE_create_category(const char *category,
-                                      const char *type,
-                                      const char *parent_category);
-XBT_PUBLIC(int) TRACE_create_category_with_color(const char *category,
-                          const char *type,
-                          const char *parent_category,
-                          const char *color);
+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,
@@ -47,13 +25,12 @@ XBT_PUBLIC(void) TRACE_set_mask(int mask);
 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(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(int) TRACE_smpi_set_category(const char *category);
+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);
 
@@ -81,31 +58,28 @@ XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task,
 #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_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_start()
-#define TRACE_end()
 #define TRACE_category(cat)
-#define TRACE_define_type(cat,supercat,final)
-#define TRACE_create_category(inst,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_set_mask(mask)
@@ -118,12 +92,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)