X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17a9f17337b1d6743025cf52e7c19a469138d38f..6d2f9a6f0b14d7fe1f51dfe3b576a9bf2397ddb5:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 98cbb15a99..ea02f0a09c 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -7,6 +7,7 @@ #ifndef INSTR_PRIVATE_H_ #define INSTR_PRIVATE_H_ +#include "instr/instr.h" #include "instr/instr_interface.h" #include "simgrid_config.h" @@ -19,10 +20,9 @@ #define INSTR_DEFAULT_STR_SIZE 500 -#include "msg/msg.h" -#include "simdag/private.h" -#include "simix/smx_private.h" -#include "xbt/graph_private.h" +#include "xbt/graph.h" +#include "xbt/dict.h" +#include "simgrid/platf.h" typedef enum { PAJE_DefineContainerType, @@ -78,6 +78,7 @@ typedef enum { INSTR_ROUTER, INSTR_AS, INSTR_SMPI, + INSTR_MSG_VM, INSTR_MSG_PROCESS, INSTR_MSG_TASK } e_container_types; @@ -97,6 +98,7 @@ typedef struct s_container { extern xbt_dict_t created_categories; extern xbt_dict_t declared_marks; extern xbt_dict_t user_host_variables; +extern xbt_dict_t user_vm_variables; extern xbt_dict_t user_link_variables; extern double TRACE_last_timestamp_to_dump; @@ -126,62 +128,10 @@ void new_pajeStartLink (double timestamp, container_t container, type_t type, co void new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key); void new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value); -/* declaration of instrumentation functions from msg_task_instr.c */ -void TRACE_msg_set_task_category(msg_task_t task, const char *category); -void TRACE_msg_task_create(msg_task_t task); -void TRACE_msg_task_execute_start(msg_task_t task); -void TRACE_msg_task_execute_end(msg_task_t task); -void TRACE_msg_task_destroy(msg_task_t task); -void TRACE_msg_task_get_start(void); -void TRACE_msg_task_get_end(double start_time, msg_task_t task); -int TRACE_msg_task_put_start(msg_task_t task); //returns TRUE if the task_put_end must be called -void TRACE_msg_task_put_end(void); - -/* declaration of instrumentation functions from msg_process_instr.c */ -char *instr_process_id (msg_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(msg_process_t process, msg_host_t old_host, - msg_host_t new_host); -void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host); -void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host); -void TRACE_msg_process_kill(msg_process_t process); -void TRACE_msg_process_suspend(msg_process_t process); -void TRACE_msg_process_resume(msg_process_t process); -void TRACE_msg_process_sleep_in(msg_process_t process); //called from msg/gos.c -void TRACE_msg_process_sleep_out(msg_process_t process); -void TRACE_msg_process_end(msg_process_t process); - -/* from surf_instr.c */ -void TRACE_surf_alloc(void); -void TRACE_surf_release(void); -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 void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst); -/* 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); -void TRACE_smpi_finalize(int rank); -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_computing_init(int rank); -void TRACE_smpi_computing_out(int rank); -void TRACE_smpi_computing_in(int rank); -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_start (void); -int TRACE_end (void); int TRACE_needs_platform (void); int TRACE_is_enabled(void); int TRACE_platform(void); @@ -193,6 +143,7 @@ int TRACE_smpi_is_computing(void); int TRACE_categorized (void); int TRACE_uncategorized (void); int TRACE_msg_process_is_enabled(void); +int TRACE_msg_vm_is_enabled(void); int TRACE_buffer (void); int TRACE_onelink_only (void); int TRACE_disable_destroy (void); @@ -202,7 +153,6 @@ char *TRACE_get_comment_file (void); char *TRACE_get_filename(void); char *TRACE_get_viva_uncat_conf (void); char *TRACE_get_viva_cat_conf (void); -void TRACE_global_init(int *argc, char **argv); void TRACE_generate_viva_uncat_conf (void); void TRACE_generate_viva_cat_conf (void); void instr_pause_tracing (void); @@ -220,7 +170,6 @@ void TRACE_surf_link_set_utilization(const char *resource, double now, double delta); void TRACE_surf_resource_utilization_alloc(void); -void TRACE_surf_resource_utilization_release(void); /* instr_paje.c */ extern xbt_dict_t trivaNodeTypes; @@ -257,16 +206,6 @@ val_t PJ_value_get_or_new (const char *name, const char *color, type_t father); val_t PJ_value_get (const char *name, const type_t father); void PJ_value_free (val_t value); -/* instr_routing.c */ -void instr_routing_define_callbacks (void); -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); -void instr_new_user_state_type (const char *father_type, const char *new_typename); -void instr_new_value_for_user_state_type (const char *typename, const char *value, 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 */ #ifdef HAVE_JEDULE