[trace] checking if platform is traced in tracing API

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

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 42ef64a..051fb32 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -64,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);
@@ -112,19 +104,9 @@ void TRACE_smx_action_destroy(smx_action_t act);
 /* from surf_instr.c */
 void TRACE_surf_alloc(void);
 void TRACE_surf_release(void);
-void TRACE_surf_host_declaration(const char *name, double power);
-void TRACE_surf_host_set_power(double date, const char *resource,
-                               double power);
-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(void *link, char *name, double bw,
-                                 double lat);
-void TRACE_surf_link_set_bandwidth(double date, void *link,
-                                   double bandwidth);
-void TRACE_surf_link_set_latency(double date, void *link, double latency);
-void TRACE_surf_save_onelink(void);
-int TRACE_surf_link_is_traced(void *link);
+void TRACE_surf_host_set_power(double date, const char *resource, double power);
+void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth);
+void TRACE_surf_link_set_latency(double date, const char *resource, double latency);
 void TRACE_surf_action(surf_action_t surf_action, const char *category);
 
 //for tracing gtnets
@@ -134,6 +116,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);
@@ -147,6 +131,8 @@ 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);
@@ -154,7 +140,7 @@ int TRACE_is_enabled(void);
 int TRACE_is_configured(void);
 int TRACE_smpi_is_enabled(void);
 int TRACE_smpi_is_grouped(void);
-int TRACE_platform_is_enabled(void);
+int TRACE_categorized (void);
 int TRACE_uncategorized (void);
 int TRACE_msg_task_is_enabled(void);
 int TRACE_msg_process_is_enabled(void);
@@ -169,12 +155,12 @@ 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,
+void TRACE_surf_host_set_utilization(const char *resource,
                                      smx_action_t smx_action,
                                      surf_action_t surf_action,
                                      double value, double now,
                                      double delta);
-void TRACE_surf_link_set_utilization(void *link, smx_action_t smx_action,
+void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_action,
                                      surf_action_t surf_action,
                                      double value, double now,
                                      double delta);
@@ -192,5 +178,16 @@ 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);
 
+/* instr_routing.c */
+void instr_routing_define_callbacks (void);
+int instr_link_is_traced (const char *name);
+char *instr_variable_type (const char *name, const char *resource);
+char *instr_resource_type (const char *resource_name);
+void instr_destroy_platform (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);
+int instr_platform_traced (void);
+
 #endif /* HAVE_TRACING */
 #endif /* INSTR_PRIVATE_H_ */