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

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 52b364a714..9aa4300fd5 100644
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -15,19 +15,6 @@
 #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,
@@ -53,7 +40,7 @@ XBT_PUBLIC(void) TRACE_user_link_variable(double time, const char *src,
                                           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);
 
@@ -101,11 +88,11 @@ XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task,
 
 #else                           /* HAVE_TRACING */
 
-#define TRACE_start()
-#define TRACE_end()
 #define TRACE_category(cat)
+#define TRACE_category_with_color(cat,color)
 #define TRACE_define_type(cat,supercat,final)
 #define TRACE_create_category(inst,cat)
+#define TRACE_create_category_with_color(inst,cat,supercat,color)
 #define TRACE_msg_set_task_category(task,cat)
 #define TRACE_msg_set_process_category(proc,cat)
 #define TRACE_set_mask(mask)