X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41dd9405e023a6edd042bc02e5fd48c90aee5d56..8a49ad1ba999dd2379dfa2959c12dd5949510f6d:/src/instr/instr_private.h?ds=inline

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 413555d4c3..42ef64a98c 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -11,16 +11,6 @@
 
 #ifdef HAVE_TRACING
 
-extern int tracing_active;      /* declared in paje.c */
-
-#define IS_TRACING			  (tracing_active)
-#define IS_TRACED(n)          (n->category)
-#define IS_TRACING_TASKS      (TRACE_msg_task_is_enabled())
-#define IS_TRACING_PLATFORM   (TRACE_platform_is_enabled())
-#define IS_TRACING_PROCESSES  (TRACE_msg_process_is_enabled())
-#define IS_TRACING_VOLUME     (TRACE_msg_volume_is_enabled())
-#define IS_TRACING_SMPI       (TRACE_smpi_is_enabled())
-
 #define INSTR_DEFAULT_STR_SIZE 500
 
 #include "instr/instr.h"
@@ -30,8 +20,8 @@ extern int tracing_active;      /* declared in paje.c */
 
 /* from paje.c */
 void TRACE_paje_create_header(void);
-void TRACE_paje_start(FILE * file);
-FILE *TRACE_paje_end(void);
+void TRACE_paje_start(void);
+void TRACE_paje_end(void);
 void pajeDefineContainerType(const char *alias, const char *containerType,
                              const char *name);
 void pajeDefineStateType(const char *alias, const char *containerType,
@@ -157,6 +147,9 @@ void TRACE_smpi_send(int rank, int src, int dst);
 void TRACE_smpi_recv(int rank, int src, int dst);
 
 /* from instr_config.c */
+void TRACE_activate (void);
+void TRACE_desactivate (void);
+int TRACE_is_active (void);
 int TRACE_is_enabled(void);
 int TRACE_is_configured(void);
 int TRACE_smpi_is_enabled(void);
@@ -168,8 +161,12 @@ int TRACE_msg_process_is_enabled(void);
 int TRACE_msg_volume_is_enabled(void);
 char *TRACE_get_filename(void);
 char *TRACE_get_platform_method(void);
+char *TRACE_get_triva_uncat_conf (void);
+char *TRACE_get_triva_cat_conf (void);
 void TRACE_global_init(int *argc, char **argv);
 void TRACE_help(int detailed);
+void TRACE_generate_triva_uncat_conf (void);
+void TRACE_generate_triva_cat_conf (void);
 
 /* from resource_utilization.c */
 void TRACE_surf_host_set_utilization(const char *name,