X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/518bd26c68915a241ed8b7b90347a0d5f14be4b8..7b7db8a4db1107ce77e923847ad4e33e02e4e27e:/src/instr/private.h

diff --git a/src/instr/private.h b/src/instr/private.h
index 52ec5bc8e5..1cfdfe4c4d 100644
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -12,14 +12,14 @@
 #ifdef HAVE_TRACING
 
 extern int tracing_active; /* declared in paje.c */
-extern int trace_mask; /* declared in interface.c */
 
 #define IS_TRACING			  (tracing_active)
 #define IS_TRACED(n)          (n->category)
-#define IS_TRACING_TASKS      ((TRACE_TASK)&trace_mask)
-#define IS_TRACING_PLATFORM   ((TRACE_PLATFORM)&trace_mask)
-#define IS_TRACING_PROCESSES  ((TRACE_PROCESS)&trace_mask)
-#define IS_TRACING_VOLUME     ((TRACE_VOLUME)&trace_mask)
+#define IS_TRACING_TASKS      (_TRACE_msg_task_enabled())
+#define IS_TRACING_PLATFORM   (_TRACE_platform_enabled())
+#define IS_TRACING_PROCESSES  (_TRACE_msg_process_enabled())
+#define IS_TRACING_VOLUME     (_TRACE_msg_volume_enabled())
+#define IS_TRACING_SMPI       (_TRACE_smpi_enabled())
 
 #include "instr/instr.h"
 #include "msg/msg.h"
@@ -66,11 +66,15 @@ char *TRACE_process_container (m_process_t process, char *output, int len);
 char *TRACE_process_alias_container (m_process_t process, m_host_t host, char *output, int len);
 char *TRACE_task_alias_container (m_task_t task, m_process_t process, m_host_t host, char *output, int len);
 
+/* from categories.c */
+void __TRACE_category_init (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 */
 void __TRACE_msg_init (void);
-void __TRACE_current_category_set (m_task_t task);
-void __TRACE_current_category_unset (void);
-char *__TRACE_current_category_get (smx_process_t proc);
 void __TRACE_task_location (m_task_t task);
 void __TRACE_task_location_present (m_task_t task);
 void __TRACE_task_location_not_present (m_task_t task);
@@ -108,17 +112,14 @@ void TRACE_smx_action_destroy (smx_action_t act);
 void __TRACE_surf_init (void);
 void __TRACE_surf_finalize (void);
 void __TRACE_surf_check_variable_set_to_zero (double now, const char *variable, const char *resource);
-void __TRACE_surf_update_action_state_resource (double now, double delta, const char *type, const char *name, double value);
 void __TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value);
 void TRACE_surf_host_declaration (char *name, double power);
 void TRACE_surf_host_set_power (double date, char *resource, double power);
-void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
 void TRACE_surf_host_define_id (const char *name, int host_id);
 void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h);
 void TRACE_surf_link_declaration (char *name, double bw, double lat);
 void TRACE_surf_link_set_bandwidth (double date, char *resource, double bandwidth);
 void TRACE_surf_link_set_latency (double date, char *resource, double latency);
-void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
 void TRACE_surf_link_save_endpoints (char *link_name, int src, int dst);
 void TRACE_surf_link_missing (void);
 void TRACE_msg_clean (void);
@@ -129,6 +130,38 @@ int TRACE_surf_gtnets_get_src (void *action);
 int TRACE_surf_gtnets_get_dst (void *action);
 void TRACE_surf_gtnets_destroy (void *action);
 
+/* from smpi_instr.c */
+void __TRACE_smpi_init (void);
+void TRACE_smpi_init (int rank);
+void TRACE_smpi_finalize (int rank);
+void TRACE_smpi_start (void);
+void TRACE_smpi_end (void);
+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_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);
+void TRACE_smpi_recv (int rank, int src, int dst);
+
+/* from instr_config.c */
+int _TRACE_configured (void);
+int _TRACE_smpi_enabled (void);
+int _TRACE_platform_enabled (void);
+int _TRACE_msg_task_enabled (void);
+int _TRACE_msg_process_enabled (void);
+int _TRACE_msg_volume_enabled (void);
+char *_TRACE_filename (void);
+void TRACE_global_init(int *argc, char **argv);
+
+/* from resource_utilization.c */
+void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
+void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
+void __TRACE_surf_resource_utilization_start (smx_action_t action);
+void __TRACE_surf_resource_utilization_event (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value);
+void __TRACE_surf_resource_utilization_end (smx_action_t action);
+void __TRACE_surf_resource_utilization_initialize (void);
+void __TRACE_surf_resource_utilization_finalize (void);
+
 #endif
 
 #endif /* PRIVATE_H_ */