#ifndef INSTR_PRIVATE_H_
#define INSTR_PRIVATE_H_
-#include "instr/tracing_config.h"
+#include "simgrid_config.h"
#ifdef HAVE_TRACING
extern int tracing_active; /* declared in paje.c */
-extern int trace_mask; /* declared in interface.c */
#define IS_TRACING (tracing_active)
#define IS_TRACED(n) (n->category)
-#define IS_TRACING_TASKS ((TRACE_TASK)&trace_mask)
-#define IS_TRACING_PLATFORM ((TRACE_PLATFORM)&trace_mask)
-#define IS_TRACING_PROCESSES ((TRACE_PROCESS)&trace_mask)
-#define IS_TRACING_VOLUME ((TRACE_VOLUME)&trace_mask)
+#define IS_TRACING_TASKS (_TRACE_msg_task_enabled())
+#define IS_TRACING_PLATFORM (_TRACE_platform_enabled())
+#define IS_TRACING_PROCESSES (_TRACE_msg_process_enabled())
+#define IS_TRACING_VOLUME (_TRACE_msg_volume_enabled())
+#define IS_TRACING_SMPI (_TRACE_smpi_enabled())
#include "instr/instr.h"
#include "msg/msg.h"
void pajeSetVariable (double time, const char *entityType, const char *container, const char *value);
void pajeAddVariable (double time, const char *entityType, const char *container, const char *value);
void pajeSubVariable (double time, const char *entityType, const char *container, const char *value);
+void pajeNewEvent (double time, const char *entityType, const char *container, const char *value);
/* from general.c */
char *TRACE_paje_msg_container (m_task_t task, char *host, char *output, int len);
int TRACE_surf_gtnets_get_dst (void *action);
void TRACE_surf_gtnets_destroy (void *action);
+/* from instr_config.c */
+int _TRACE_smpi_enabled (void);
+int _TRACE_platform_enabled (void);
+int _TRACE_msg_task_enabled (void);
+int _TRACE_msg_process_enabled (void);
+int _TRACE_msg_volume_enabled (void);
+char *_TRACE_filename (void);
+void TRACE_global_init(int *argc, char **argv);
+
+
#endif
#endif /* PRIVATE_H_ */