X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24a9a43343e8bb1e6ae073d8a480de24ffcf4d2f..9b827425899c721a826dde8f8d7a7976d442f94b:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 39a93630e5..839cd84e8c 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -11,8 +11,6 @@
 
 #ifdef HAVE_TRACING
 
-#define IS_TRACED(n)          (n->category)
-
 #define INSTR_DEFAULT_STR_SIZE 500
 
 #include "instr/instr.h"
@@ -22,8 +20,8 @@
 
 /* from paje.c */
 void TRACE_paje_create_header(void);
-void TRACE_paje_start(FILE * file);
-FILE *TRACE_paje_end(void);
+void TRACE_paje_start(void);
+void TRACE_paje_end(void);
 void pajeDefineContainerType(const char *alias, const char *containerType,
                              const char *name);
 void pajeDefineStateType(const char *alias, const char *containerType,
@@ -66,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);
@@ -114,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
@@ -136,6 +122,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);
@@ -149,6 +137,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);
@@ -156,23 +146,27 @@ 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);
 int TRACE_msg_volume_is_enabled(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);
 void TRACE_help(int detailed);
+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,5 +184,12 @@ 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_link_type (const char *name);
+char *instr_host_type (const char *name);
+void instr_destroy_platform (void);
+
 #endif /* HAVE_TRACING */
 #endif /* INSTR_PRIVATE_H_ */