Fix memory leaks

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

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 5475cb6..a8d4872 100644 (file)
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -15,24 +15,17 @@
 #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
-
-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_msg_set_task_category(m_task_t task,
                                              const char *category);
 XBT_PUBLIC(void) TRACE_msg_set_process_category(m_process_t process,
@@ -47,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);
 
@@ -95,9 +88,8 @@ 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_msg_set_task_category(task,cat)