X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd11f6528fc5e8254511eb87dd907bef552e8471..782f84d80ed8b775a1973115f6266ae487cae918:/include/instr/instr.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 7938d1794f..0e30ddb9d7 100644
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -7,13 +7,9 @@
 #ifndef INSTR_H_
 #define INSTR_H_
 
-#ifdef HAVE_TRACING
+#include "simgrid_config.h"
 
-#define NO_TRACE		0
-#define TRACE_PLATFORM  1
-#define TRACE_PROCESS   2
-#define TRACE_TASK      4
-#define TRACE_VOLUME    8
+#ifdef HAVE_TRACING
 
 #include "xbt.h"
 #include "msg/msg.h"
@@ -28,8 +24,7 @@
 #define TRACE_ERROR_FILE_OPEN 401
 #define TRACE_ERROR_START 500
 
-XBT_PUBLIC(int) TRACE_start_with_mask (const char *filename, int mask);
-XBT_PUBLIC(int) TRACE_start (const char *filename);
+XBT_PUBLIC(int) TRACE_start (void);
 XBT_PUBLIC(int) TRACE_end (void);
 XBT_PUBLIC(int) TRACE_category (const char *category);
 XBT_PUBLIC(void) TRACE_define_type (const char *type, const char *parent_type, int final);
@@ -39,6 +34,9 @@ XBT_PUBLIC(void) TRACE_msg_set_process_category (m_process_t process, const char
 XBT_PUBLIC(void) TRACE_set_mask (int mask);
 XBT_PUBLIC(void) __TRACE_host_variable (double time, const char *variable, double value, const char *what);
 XBT_PUBLIC(void) __TRACE_link_variable (double time, const char *src, const char *dst, 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);
 
 #define TRACE_host_variable_declare(var) \
 	__TRACE_host_variable(0,var,0,"declare");
@@ -84,8 +82,7 @@ XBT_PUBLIC(void) __TRACE_link_variable (double time, const char *src, const char
 
 #else /* HAVE_TRACING */
 
-#define TRACE_start(filename)
-#define TRACE_start_with_mask(filename,mask)
+#define TRACE_start()
 #define TRACE_end()
 #define TRACE_category(cat)
 #define TRACE_define_type(cat,supercat,final)
@@ -108,6 +105,9 @@ XBT_PUBLIC(void) __TRACE_link_variable (double time, const char *src, const char
 #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_declare_mark(type)
+#define TRACE_mark(type,value)
+#define TRACE_smpi_set_category(cat)
 
 #endif /* HAVE_TRACING */