X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86..d9cad55dcc546b3936c278258e7f463ac70066df:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index ce67b0923a..ba347a5c2d 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -29,7 +29,7 @@ typedef enum { TYPE_LINK, TYPE_CONTAINER, TYPE_STATE, - TYPE_EVENT, + TYPE_EVENT } e_entity_types; typedef struct s_type *type_t; @@ -58,11 +58,12 @@ typedef enum { INSTR_AS, INSTR_SMPI, INSTR_MSG_PROCESS, - INSTR_MSG_TASK, + INSTR_MSG_TASK } e_container_types; typedef struct s_container *container_t; typedef struct s_container { + 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 */ @@ -73,6 +74,9 @@ 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; /* from paje.c */ @@ -94,12 +98,13 @@ 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 */ -char *TRACE_task_container(m_task_t task, char *output, int len); +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); @@ -110,17 +115,17 @@ int TRACE_msg_task_put_start(m_task_t task); //returns TRUE if the task_put_e 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, +void TRACE_msg_process_change_host(msg_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_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); @@ -131,8 +136,7 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten void TRACE_surf_action(surf_action_t surf_action, const char *category); //for tracing gtnets -void TRACE_surf_gtnets_communicate(void *action, const char *src, const char *dst); -void TRACE_surf_gtnets_destroy(void *action); +void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst); /* from smpi_instr.c */ void TRACE_internal_smpi_set_category (const char *category); @@ -166,36 +170,29 @@ int TRACE_disable_destroy (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_set_network_update_mechanism (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, - smx_action_t smx_action, - surf_action_t surf_action, - double value, double now, + const char *category, + double value, + double now, double delta); -void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_action, - surf_action_t surf_action, - double value, double now, +void TRACE_surf_link_set_utilization(const char *resource, + const char *category, + double value, + double now, double delta); -void TRACE_surf_resource_utilization_start(smx_action_t action); -void TRACE_surf_resource_utilization_event(smx_action_t action, double now, - double delta, - const char *variable, - const char *resource, - double value); -void TRACE_surf_resource_utilization_end(smx_action_t action); void TRACE_surf_resource_utilization_alloc(void); void TRACE_surf_resource_utilization_release(void); -/* sd_instr.c */ -void TRACE_sd_task_create(SD_task_t task); -void TRACE_sd_task_destroy(SD_task_t task); - /* instr_paje.c */ extern xbt_dict_t trivaNodeTypes; extern xbt_dict_t trivaEdgeTypes; @@ -227,6 +224,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); @@ -234,6 +232,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);