[trace] updating the entry point functions of resource utilization tracing

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

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 18aa963..839cd84 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -104,19 +104,15 @@ 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_action(surf_action_t surf_action, const char *category);
 
 //for tracing gtnets
@@ -150,7 +146,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);
@@ -165,12 +161,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);
@@ -190,6 +186,10 @@ 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_link_type (const char *name);
+char *instr_host_type (const char *name);
+void instr_destroy_platform (void);
 
 #endif /* HAVE_TRACING */
 #endif /* INSTR_PRIVATE_H_ */