X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/59c1235e4f5d1f4d572ebcceaa9cab3d0a09de21..a19462ddb88de9570e7c811e0ffa17964c98f936:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 1dc1ca49cd..2b56b6dce8 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -1,28 +1,53 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef INSTR_PRIVATE_H_ #define INSTR_PRIVATE_H_ +#include "instr/instr.h" +#include "instr/instr_interface.h" +#include "internal_config.h" #include "simgrid_config.h" #ifdef HAVE_TRACING +SG_BEGIN_DECL() + /* Need to define function drand48 for Windows */ +/* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */ #ifdef _WIN32 # define drand48() (rand()/(RAND_MAX + 1.0)) #endif #define INSTR_DEFAULT_STR_SIZE 500 -#include "instr/instr.h" -#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, + 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, @@ -57,13 +82,14 @@ typedef enum { INSTR_ROUTER, INSTR_AS, INSTR_SMPI, + INSTR_MSG_VM, INSTR_MSG_PROCESS, INSTR_MSG_TASK } e_container_types; 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 */ @@ -73,104 +99,207 @@ typedef struct s_container { xbt_dict_t children; }s_container_t; +typedef struct paje_event *paje_event_t; +typedef struct paje_event { + double timestamp; + e_event_type event_type; + void (*print) (paje_event_t event); + void (*free) (paje_event_t event); + void *data; +} s_paje_event_t; + +typedef struct s_defineContainerType *defineContainerType_t; +typedef struct s_defineContainerType { + type_t type; +}s_defineContainerType_t; + +typedef struct s_defineVariableType *defineVariableType_t; +typedef struct s_defineVariableType { + type_t type; +}s_defineVariableType_t; + +typedef struct s_defineStateType *defineStateType_t; +typedef struct s_defineStateType { + type_t type; +}s_defineStateType_t; + +typedef struct s_defineEventType *defineEventType_t; +typedef struct s_defineEventType { + type_t type; +}s_defineEventType_t; + +typedef struct s_defineLinkType *defineLinkType_t; +typedef struct s_defineLinkType { + type_t type; + type_t source; + type_t dest; +}s_defineLinkType_t; + +typedef struct s_defineEntityValue *defineEntityValue_t; +typedef struct s_defineEntityValue { + val_t value; +}s_defineEntityValue_t; + +typedef struct s_createContainer *createContainer_t; +typedef struct s_createContainer { + container_t container; +}s_createContainer_t; + +typedef struct s_destroyContainer *destroyContainer_t; +typedef struct s_destroyContainer { + container_t container; +}s_destroyContainer_t; + +typedef struct s_setVariable *setVariable_t; +typedef struct s_setVariable { + container_t container; + type_t type; + double value; +}s_setVariable_t; + +typedef struct s_addVariable *addVariable_t; +typedef struct s_addVariable { + container_t container; + type_t type; + double value; +}s_addVariable_t; + +typedef struct s_subVariable *subVariable_t; +typedef struct s_subVariable { + container_t container; + type_t type; + double value; +}s_subVariable_t; + +typedef struct s_setState *setState_t; +typedef struct s_setState { + container_t container; + type_t type; + val_t value; +}s_setState_t; + +typedef struct s_pushState *pushState_t; +typedef struct s_pushState { + container_t container; + type_t type; + val_t value; + int size; + void* extra; +}s_pushState_t; + +typedef struct s_popState *popState_t; +typedef struct s_popState { + container_t container; + type_t type; + xbt_dynar_t extra; +}s_popState_t; + +typedef struct s_resetState *resetState_t; +typedef struct s_resetState { + container_t container; + type_t type; +}s_resetState_t; + +typedef struct s_startLink *startLink_t; +typedef struct s_startLink { + container_t container; + type_t type; + container_t sourceContainer; + char *value; + char *key; + int size; +}s_startLink_t; + +typedef struct s_endLink *endLink_t; +typedef struct s_endLink { + container_t container; + type_t type; + container_t destContainer; + char *value; + char *key; +}s_endLink_t; + +typedef struct s_newEvent *newEvent_t; +typedef struct s_newEvent { + container_t container; + type_t type; + val_t value; +}s_newEvent_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_vm_variables; +extern xbt_dict_t user_link_variables; extern double TRACE_last_timestamp_to_dump; +/* instr_paje_header.c */ +void TRACE_header(int basic, int size); + /* from paje.c */ -void TRACE_paje_create_header(void); +void TRACE_init(void); +void TRACE_finalize(void); +void TRACE_paje_init(void); void TRACE_paje_start(void); void TRACE_paje_end(void); void TRACE_paje_dump_buffer (int force); -void new_pajeDefineContainerType(type_t type); -void new_pajeDefineVariableType(type_t type); -void new_pajeDefineStateType(type_t type); -void new_pajeDefineEventType(type_t type); -void new_pajeDefineLinkType(type_t type, type_t source, type_t dest); -void new_pajeDefineEntityValue (val_t type); -void new_pajeCreateContainer (container_t container); -void new_pajeDestroyContainer (container_t container); -void new_pajeSetVariable (double timestamp, container_t container, type_t type, double value); -void new_pajeAddVariable (double timestamp, container_t container, type_t type, double value); -void new_pajeSubVariable (double timestamp, container_t container, type_t type, double value); -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_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); -char *TRACE_task_container(m_task_t task, char *output, int len); -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_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_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_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); - -/* 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); +XBT_PUBLIC(void) new_pajeDefineContainerType(type_t type); +XBT_PUBLIC(void) new_pajeDefineVariableType(type_t type); +XBT_PUBLIC(void) new_pajeDefineStateType(type_t type); +XBT_PUBLIC(void) new_pajeDefineEventType(type_t type); +XBT_PUBLIC(void) new_pajeDefineLinkType(type_t type, type_t source, type_t dest); +XBT_PUBLIC(void) new_pajeDefineEntityValue (val_t type); +XBT_PUBLIC(void) new_pajeCreateContainer (container_t container); +XBT_PUBLIC(void) new_pajeDestroyContainer (container_t container); +XBT_PUBLIC(void) new_pajeSetVariable (double timestamp, container_t container, type_t type, double value); +XBT_PUBLIC(void) new_pajeAddVariable (double timestamp, container_t container, type_t type, double value); +XBT_PUBLIC(void) new_pajeSubVariable (double timestamp, container_t container, type_t type, double value); +XBT_PUBLIC(void) new_pajeSetState (double timestamp, container_t container, type_t type, val_t value); +XBT_PUBLIC(void) new_pajePushState (double timestamp, container_t container, type_t type, val_t value); +XBT_PUBLIC(void) new_pajePushStateWithExtra (double timestamp, container_t container, type_t type, val_t value, void* extra); +XBT_PUBLIC(void) new_pajePopState (double timestamp, container_t container, type_t type); +XBT_PUBLIC(void) new_pajeResetState (double timestamp, container_t container, type_t type); +XBT_PUBLIC(void) new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key); +XBT_PUBLIC(void) new_pajeStartLinkWithSize (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key, int size); +XBT_PUBLIC(void) new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key); +XBT_PUBLIC(void) new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value); //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_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); +int TRACE_platform_topology(void); int TRACE_is_configured(void); -int TRACE_smpi_is_enabled(void); -int TRACE_smpi_is_grouped(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_disable_link(void); +int TRACE_disable_power(void); int TRACE_onelink_only (void); int TRACE_disable_destroy (void); +int TRACE_basic (void); +int TRACE_display_sizes (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); -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); +char *TRACE_get_viva_uncat_conf (void); +char *TRACE_get_viva_cat_conf (void); +void TRACE_generate_viva_uncat_conf (void); +void TRACE_generate_viva_cat_conf (void); +void instr_pause_tracing (void); +void instr_resume_tracing (void); + +/* Public functions used in SMPI */ +XBT_PUBLIC(int) TRACE_smpi_is_enabled(void); +XBT_PUBLIC(int) TRACE_smpi_is_grouped(void); +XBT_PUBLIC(int) TRACE_smpi_is_computing(void); +XBT_PUBLIC(int) TRACE_smpi_is_sleeping(void); +XBT_PUBLIC(int) TRACE_smpi_view_internals(void); /* from resource_utilization.c */ void TRACE_surf_host_set_utilization(const char *resource, @@ -184,12 +313,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); - -/* sd_instr.c */ -void TRACE_sd_set_task_category(SD_task_t task, const char *category); -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; @@ -197,41 +320,151 @@ extern xbt_dict_t trivaEdgeTypes; long long int instr_new_paje_id (void); void PJ_container_alloc (void); void PJ_container_release (void); -container_t PJ_container_new (const char *name, e_container_types kind, container_t father); -container_t PJ_container_get (const char *name); -container_t PJ_container_get_or_null (const char *name); -container_t PJ_container_get_root (void); -void PJ_container_set_root (container_t root); -void PJ_container_free (container_t container); -void PJ_container_free_all (void); -void PJ_container_remove_from_parent (container_t container); +XBT_PUBLIC(container_t) PJ_container_new (const char *name, e_container_types kind, container_t father); +XBT_PUBLIC(container_t) PJ_container_get (const char *name); +XBT_PUBLIC(container_t) PJ_container_get_or_null (const char *name); +XBT_PUBLIC(container_t) PJ_container_get_root (void); +XBT_PUBLIC(void) PJ_container_set_root (container_t root); +XBT_PUBLIC(void) PJ_container_free (container_t container); +XBT_PUBLIC(void) PJ_container_free_all (void); +XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container); /* instr_paje_types.c */ void PJ_type_alloc (void); void PJ_type_release (void); -type_t PJ_type_get_root (void); +XBT_PUBLIC(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); -type_t PJ_type_get (const char *name, const type_t father); -type_t PJ_type_get_or_null (const char *name, type_t father); +XBT_PUBLIC(type_t) PJ_type_get (const char *name, const type_t father); +XBT_PUBLIC(type_t) PJ_type_get_or_null (const char *name, type_t father); void PJ_type_free (type_t type); 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 (const char *name, const type_t father); +XBT_PUBLIC(val_t) PJ_value_new (const char *name, const char *color, type_t father); +XBT_PUBLIC(val_t) PJ_value_get_or_new (const char *name, const char *color, type_t father); +XBT_PUBLIC(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); -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); +void print_pajeDefineContainerType(paje_event_t event); +void print_pajeDefineVariableType(paje_event_t event); +void print_pajeDefineStateType(paje_event_t event); +void print_pajeDefineEventType(paje_event_t event); +void print_pajeDefineLinkType(paje_event_t event); +void print_pajeDefineEntityValue (paje_event_t event); +void print_pajeCreateContainer(paje_event_t event); +void print_pajeDestroyContainer(paje_event_t event); +void print_pajeSetVariable(paje_event_t event); +void print_pajeAddVariable(paje_event_t event); +void print_pajeSubVariable(paje_event_t event); +void print_pajeSetState(paje_event_t event); +void print_pajePushState(paje_event_t event); +void print_pajePopState(paje_event_t event); +void print_pajeResetState(paje_event_t event); +void print_pajeStartLink(paje_event_t event); +void print_pajeEndLink(paje_event_t event); +void print_pajeNewEvent (paje_event_t event); + +void print_TIPushState(paje_event_t event); +void print_TICreateContainer(paje_event_t event); +void print_TIDestroyContainer(paje_event_t event); +void TRACE_TI_start(void); +void TRACE_TI_end(void); +void TRACE_TI_init(void); + +void print_NULL (paje_event_t event); +void TRACE_paje_dump_buffer (int force); +void dump_comment_file (const char *filename); +void dump_comment (const char *comment); + + + + +typedef struct instr_trace_writer { + void (*print_DefineContainerType) (paje_event_t event); + void (*print_DefineVariableType)(paje_event_t event); + void (*print_DefineStateType)(paje_event_t event); + void (*print_DefineEventType)(paje_event_t event); + void (*print_DefineLinkType)(paje_event_t event); + void (*print_DefineEntityValue)(paje_event_t event); + void (*print_CreateContainer)(paje_event_t event); + void (*print_DestroyContainer)(paje_event_t event); + void (*print_SetVariable)(paje_event_t event); + void (*print_AddVariable)(paje_event_t event); + void (*print_SubVariable)(paje_event_t event); + void (*print_SetState)(paje_event_t event); + void (*print_PushState)(paje_event_t event); + void (*print_PopState)(paje_event_t event); + void (*print_ResetState)(paje_event_t event); + void (*print_StartLink)(paje_event_t event); + void (*print_EndLink)(paje_event_t event); + void (*print_NewEvent) (paje_event_t event); +} s_instr_trace_writer_t; + + + +struct s_instr_extra_data; +typedef struct s_instr_extra_data *instr_extra_data; + + +typedef enum{ + TRACING_INIT, + TRACING_FINALIZE, + TRACING_COMM_SIZE, + TRACING_COMM_SPLIT, + TRACING_COMM_DUP, + TRACING_SEND, + TRACING_ISEND, + TRACING_SSEND, + TRACING_ISSEND, + TRACING_RECV, + TRACING_IRECV, + TRACING_SENDRECV, + TRACING_TEST, + TRACING_WAIT, + TRACING_WAITALL, + TRACING_WAITANY, + TRACING_BARRIER, + TRACING_BCAST, + TRACING_REDUCE, + TRACING_ALLREDUCE, + TRACING_ALLTOALL, + TRACING_ALLTOALLV, + TRACING_GATHER, + TRACING_GATHERV, + TRACING_SCATTER, + TRACING_SCATTERV, + TRACING_ALLGATHER, + TRACING_ALLGATHERV, + TRACING_REDUCE_SCATTER, + TRACING_COMPUTING, + TRACING_SLEEPING, + TRACING_SCAN, + TRACING_EXSCAN +} e_caller_type ; + + + +typedef struct s_instr_extra_data { + e_caller_type type; + int send_size; + int recv_size; + double comp_size; + double sleep_duration; + int src; + int dst; + int root; + const char* datatype1; + const char* datatype2; + int * sendcounts; + int * recvcounts; + int num_processes; +} s_instr_extra_data_t; + +SG_END_DECL() #endif /* HAVE_TRACING */