Restructure config headers

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index b4b661f..98cbb15 100644 (file)
--- 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"
@@ -185,6 +185,7 @@ 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);
@@ -199,14 +200,9 @@ 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);