X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae855a0d996d06d373fbc233e78b0fbe7f1f2df6..d938d09d362186118485ebc3ad0a9d9ce4079bfa:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index f6942c9c66..c6e1479ae7 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,
@@ -74,14 +64,6 @@ void pajeSubVariable(double time, const char *entityType,
 void pajeNewEvent(double time, const char *entityType,
                   const char *container, const char *value);
 
-/* from categories.c */
-void TRACE_category_alloc(void);
-void TRACE_category_release(void);
-void TRACE_category_set(smx_process_t proc, const char *category);
-char *TRACE_category_get(smx_process_t proc);
-void TRACE_category_unset(smx_process_t proc);
-void TRACE_msg_category_set(smx_process_t proc, m_task_t task);
-
 /* declaration of instrumentation functions from msg_task_instr.c */
 char *TRACE_task_container(m_task_t task, char *output, int len);
 void TRACE_msg_task_alloc(void);
@@ -144,6 +126,8 @@ int TRACE_surf_gtnets_get_dst(void *action);
 void TRACE_surf_gtnets_destroy(void *action);
 
 /* from smpi_instr.c */
+void TRACE_internal_smpi_set_category (const char *category);
+const char *TRACE_internal_smpi_get_category (void);
 void TRACE_smpi_alloc(void);
 void TRACE_smpi_release(void);
 void TRACE_smpi_init(int rank);
@@ -157,6 +141,11 @@ 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_start (void);
+int TRACE_end (void);
+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 +157,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,
@@ -195,6 +188,5 @@ void TRACE_surf_resource_utilization_release(void);
 void TRACE_sd_task_create(SD_task_t task);
 void TRACE_sd_task_destroy(SD_task_t task);
 
-#endif
-
-#endif                          /* PRIVATE_H_ */
+#endif /* HAVE_TRACING */
+#endif /* INSTR_PRIVATE_H_ */