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

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 58b447546d..98cbb15a99 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -7,6 +7,7 @@
 #ifndef INSTR_PRIVATE_H_
 #define INSTR_PRIVATE_H_
 
+#include "instr/instr_interface.h"
 #include "simgrid_config.h"
 
 #ifdef HAVE_TRACING
@@ -18,7 +19,6 @@
 
 #define INSTR_DEFAULT_STR_SIZE 500
 
-#include "instr/instr.h"
 #include "msg/msg.h"
 #include "simdag/private.h"
 #include "simix/smx_private.h"
@@ -171,6 +171,9 @@ void TRACE_smpi_init(int rank);
 void TRACE_smpi_finalize(int rank);
 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_computing_init(int rank);
+void TRACE_smpi_computing_out(int rank);
+void TRACE_smpi_computing_in(int rank);
 void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation);
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation);
 void TRACE_smpi_send(int rank, int src, int dst);
@@ -182,9 +185,11 @@ int TRACE_end (void);
 int TRACE_needs_platform (void);
 int TRACE_is_enabled(void);
 int TRACE_platform(void);
+int TRACE_platform_topology(void);
 int TRACE_is_configured(void);
 int TRACE_smpi_is_enabled(void);
 int TRACE_smpi_is_grouped(void);
+int TRACE_smpi_is_computing(void);
 int TRACE_categorized (void);
 int TRACE_uncategorized (void);
 int TRACE_msg_process_is_enabled(void);
@@ -192,17 +197,16 @@ int TRACE_buffer (void);
 int TRACE_onelink_only (void);
 int TRACE_disable_destroy (void);
 int TRACE_basic (void);
+char *TRACE_get_comment (void);
+char *TRACE_get_comment_file (void);
 char *TRACE_get_filename(void);
-char *TRACE_get_triva_uncat_conf (void);
-char *TRACE_get_triva_cat_conf (void);
 char *TRACE_get_viva_uncat_conf (void);
 char *TRACE_get_viva_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);
 void TRACE_generate_viva_uncat_conf (void);
 void TRACE_generate_viva_cat_conf (void);
+void instr_pause_tracing (void);
+void instr_resume_tracing (void);
 
 /* from resource_utilization.c */
 void TRACE_surf_host_set_utilization(const char *resource,