X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/960d34134e4221c5ec5506e69ba21fd725743c5a..21b9c5dd068c05fbac421c871f809616b9c6535b:/src/instr/private.h

diff --git a/src/instr/private.h b/src/instr/private.h
index 113ec5ae6d..107961e91a 100644
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -12,14 +12,14 @@
 #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"
@@ -54,6 +54,7 @@ void pajeDefineVariableType(const char *alias, const char *containerType, const
 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);
@@ -128,6 +129,28 @@ int TRACE_surf_gtnets_get_src (void *action);
 int TRACE_surf_gtnets_get_dst (void *action);
 void TRACE_surf_gtnets_destroy (void *action);
 
+/* from smpi_instr.c */
+void __TRACE_smpi_init (void);
+void TRACE_smpi_init (int rank);
+void TRACE_smpi_finalize (int rank);
+void TRACE_smpi_start (void);
+void TRACE_smpi_end (void);
+void TRACE_smpi_collective_in (int rank, int root, const char *operation);
+void TRACE_smpi_collective_out (int rank, int root, const char *operation);
+void TRACE_smpi_send (int rank, int src, int dst);
+void TRACE_smpi_recv (int rank, int src, int dst);
+
+/* from instr_config.c */
+int _TRACE_configured (void);
+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_ */