[trace] cosmetics, remove TRACE_is_active, use TRACE_is_enabled instead

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

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 67d8793..bc32e07 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -17,6 +17,7 @@
 #include "msg/msg.h"
 #include "simdag/private.h"
 #include "simix/private.h"
+#include "xbt/graph_private.h"
 
 typedef enum {
   TYPE_VARIABLE,
@@ -105,9 +106,10 @@ void TRACE_msg_task_put_end(void);
 
 /* declaration of instrumentation functions from msg_process_instr.c */
 char *instr_process_id (m_process_t proc, char *str, int len);
+char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len);
 void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host,
                                    m_host_t new_host);
-void TRACE_msg_process_create (m_process_t process);
+void TRACE_msg_process_create (const char *process_name, int process_pid, m_host_t host);
 void TRACE_msg_process_kill(m_process_t process);
 void TRACE_msg_process_suspend(m_process_t process);
 void TRACE_msg_process_resume(m_process_t process);
@@ -115,10 +117,6 @@ void TRACE_msg_process_sleep_in(m_process_t process);   //called from msg/gos.c
 void TRACE_msg_process_sleep_out(m_process_t process);
 void TRACE_msg_process_end(m_process_t process);
 
-/* declaration of instrumentation functions from msg_volume.c */
-void TRACE_msg_volume_start(m_task_t task);
-void TRACE_msg_volume_finish(m_task_t task);
-
 /* from smx.c */
 void TRACE_smx_host_execute(smx_action_t act);
 void TRACE_smx_action_communicate(smx_action_t act, smx_process_t proc);
@@ -133,9 +131,7 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten
 void TRACE_surf_action(surf_action_t surf_action, const char *category);
 
 //for tracing gtnets
-void TRACE_surf_gtnets_communicate(void *action, int src, int dst);
-int TRACE_surf_gtnets_get_src(void *action);
-int TRACE_surf_gtnets_get_dst(void *action);
+void TRACE_surf_gtnets_communicate(void *action, const char *src, const char *dst);
 void TRACE_surf_gtnets_destroy(void *action);
 
 /* from smpi_instr.c */
@@ -156,10 +152,9 @@ 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_needs_platform (void);
 int TRACE_is_enabled(void);
+int TRACE_platform(void);
 int TRACE_is_configured(void);
 int TRACE_smpi_is_enabled(void);
 int TRACE_smpi_is_grouped(void);
@@ -167,9 +162,9 @@ int TRACE_categorized (void);
 int TRACE_uncategorized (void);
 int TRACE_msg_task_is_enabled(void);
 int TRACE_msg_process_is_enabled(void);
-int TRACE_msg_volume_is_enabled(void);
+int TRACE_buffer (void);
+int TRACE_onelink_only (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);
@@ -226,10 +221,11 @@ void destroyAllContainers (void);
 
 /* instr_routing.c */
 void instr_routing_define_callbacks (void);
-void instr_new_user_variable_type (const char *new_typename, const char *color);
-void instr_new_user_link_variable_type  (const char *new_typename, const char *color);
-void instr_new_user_host_variable_type  (const char *new_typename, const char *color);
+void instr_new_variable_type (const char *new_typename, const char *color);
+void instr_new_user_variable_type  (const char *father_type, const char *new_typename, const char *color);
 int instr_platform_traced (void);
+xbt_graph_t instr_routing_platform_graph (void);
+void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);
 
 #endif /* HAVE_TRACING */