X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ca8ab389d1596ca644a2209fd84653fc3e2a565..fd317f3cbf1cafcd1eeb4841b9a4b22d0dc81a0b:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 028a62f32d..ac6d1e4730 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -24,6 +24,27 @@ #include "simix/smx_private.h" #include "xbt/graph_private.h" +typedef enum { + PAJE_DefineContainerType, + PAJE_DefineVariableType, + PAJE_DefineStateType, + PAJE_DefineEventType, + PAJE_DefineLinkType, + PAJE_DefineEntityValue, + PAJE_CreateContainer, + PAJE_DestroyContainer, + PAJE_SetVariable, + PAJE_AddVariable, + PAJE_SubVariable, + PAJE_SetState, + PAJE_PushState, + PAJE_PopState, + PAJE_ResetState, + PAJE_StartLink, + PAJE_EndLink, + PAJE_NewEvent +} e_event_type; + typedef enum { TYPE_VARIABLE, TYPE_LINK, @@ -63,7 +84,7 @@ typedef enum { typedef struct s_container *container_t; typedef struct s_container { - network_element_t net_elm; + sg_routing_edge_t net_elm; char *name; /* Unique name of this container */ char *id; /* Unique id of this container */ type_t type; /* Type of this container */ @@ -74,10 +95,15 @@ typedef struct s_container { }s_container_t; extern xbt_dict_t created_categories; +extern xbt_dict_t declared_marks; +extern xbt_dict_t user_host_variables; +extern xbt_dict_t user_link_variables; extern double TRACE_last_timestamp_to_dump; +/* instr_paje_header.c */ +void TRACE_header(int basic); + /* from paje.c */ -void TRACE_paje_create_header(void); void TRACE_paje_start(void); void TRACE_paje_end(void); void TRACE_paje_dump_buffer (int force); @@ -95,33 +121,35 @@ void new_pajeSubVariable (double timestamp, container_t container, type_t type, void new_pajeSetState (double timestamp, container_t container, type_t type, val_t value); void new_pajePushState (double timestamp, container_t container, type_t type, val_t value); void new_pajePopState (double timestamp, container_t container, type_t type); +void new_pajeResetState (double timestamp, container_t container, type_t type); void new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key); 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(m_task_t task, const char *category); -void TRACE_msg_task_create(m_task_t task); -void TRACE_msg_task_execute_start(m_task_t task); -void TRACE_msg_task_execute_end(m_task_t task); -void TRACE_msg_task_destroy(m_task_t task); +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, m_task_t task); -int TRACE_msg_task_put_start(m_task_t task); //returns TRUE if the task_put_end must be called +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 (m_process_t proc, char *str, int len); +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(m_process_t process, m_host_t old_host, - m_host_t new_host); -void TRACE_msg_process_create (const char *process_name, int process_pid, m_host_t host); -void TRACE_msg_process_kill(m_process_t process); -void TRACE_msg_process_suspend(m_process_t process); -void TRACE_msg_process_resume(m_process_t process); -void TRACE_msg_process_sleep_in(m_process_t process); //called from msg/gos.c -void TRACE_msg_process_sleep_out(m_process_t process); -void TRACE_msg_process_end(m_process_t process); +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); @@ -143,6 +171,9 @@ 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); @@ -157,19 +188,27 @@ int TRACE_platform(void); int TRACE_is_configured(void); int TRACE_smpi_is_enabled(void); int TRACE_smpi_is_grouped(void); +int TRACE_smpi_is_computing(void); int TRACE_categorized (void); int TRACE_uncategorized (void); int TRACE_msg_process_is_enabled(void); int TRACE_buffer (void); int TRACE_onelink_only (void); int TRACE_disable_destroy (void); +int TRACE_basic (void); +char *TRACE_get_comment (void); +char *TRACE_get_comment_file (void); char *TRACE_get_filename(void); char *TRACE_get_triva_uncat_conf (void); char *TRACE_get_triva_cat_conf (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_help(int detailed); void TRACE_generate_triva_uncat_conf (void); void TRACE_generate_triva_cat_conf (void); +void TRACE_generate_viva_uncat_conf (void); +void TRACE_generate_viva_cat_conf (void); /* from resource_utilization.c */ void TRACE_surf_host_set_utilization(const char *resource, @@ -205,7 +244,7 @@ void PJ_type_alloc (void); void PJ_type_release (void); type_t PJ_type_get_root (void); type_t PJ_type_container_new (const char *name, type_t father); -type_t PJ_type_event_new (const char *name, const char *color, type_t father); +type_t PJ_type_event_new (const char *name, type_t father); type_t PJ_type_variable_new (const char *name, const char *color, type_t father); type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest); type_t PJ_type_state_new (const char *name, type_t father); @@ -216,6 +255,7 @@ void PJ_type_free_all (void); /* instr_paje_values.c */ val_t PJ_value_new (const char *name, const char *color, type_t father); +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); @@ -223,6 +263,8 @@ void PJ_value_free (val_t value); 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);