X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ec4cdb61b9430ccbbb5f07e48d46039aa72609f..fb81c8bcd9bf351c3a575908adfa783b0b375e10:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 2c0fc4b57a..36615e6217 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -1,20 +1,22 @@ -/* Copyright (c) 2010-2013. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2017. 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 + +#include "simgrid/instr.h" #include "instr/instr_interface.h" -#include "internal_config.h" +#include "src/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 @@ -23,7 +25,6 @@ #include "xbt/graph.h" #include "xbt/dict.h" -#include "simgrid/platf.h" typedef enum { PAJE_DefineContainerType, @@ -65,14 +66,20 @@ typedef struct s_type { xbt_dict_t values; //valid for all types except variable and container }s_type_t; -typedef struct s_val *val_t; -typedef struct s_val { +//-------------------------------------------------- +class s_val; +typedef s_val *val_t; + +class s_val { + public: char *id; char *name; char *color; type_t father; -}s_val_t; +}; +typedef s_val s_val_t; +//-------------------------------------------------- typedef enum { INSTR_HOST, INSTR_LINK, @@ -84,26 +91,37 @@ typedef enum { INSTR_MSG_TASK } e_container_types; -typedef struct s_container *container_t; -typedef struct s_container { - sg_routing_edge_t net_elm; +//-------------------------------------------------- +class s_container; +typedef s_container *container_t; + +class s_container { + public: + sg_netpoint_t netpoint; char *name; /* Unique name of this container */ char *id; /* Unique id of this container */ type_t type; /* Type of this container */ int level; /* Level in the hierarchy, root level is 0 */ e_container_types kind; /* This container is of what kind */ - struct s_container *father; + s_container *father; xbt_dict_t children; -}s_container_t; +}; +typedef s_container s_container_t; + +//-------------------------------------------------- +class paje_event; +typedef paje_event *paje_event_t; -typedef struct paje_event *paje_event_t; -typedef struct paje_event { +class paje_event { + public: 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 paje_event s_paje_event_t; +//-------------------------------------------------- typedef struct s_defineContainerType *defineContainerType_t; typedef struct s_defineContainerType { @@ -161,28 +179,51 @@ typedef struct s_addVariable { double value; }s_addVariable_t; -typedef struct s_subVariable *subVariable_t; -typedef struct s_subVariable { +//-------------------------------------------------- +class s_subVariable; + +typedef s_subVariable *subVariable_t; + +class s_subVariable { + public: container_t container; type_t type; double value; -}s_subVariable_t; + //methods + XBT_PUBLIC(void) new_pajeSubVariable (double timestamp, container_t container, type_t type, double value); +}; +typedef s_subVariable s_subVariable_t; +//-------------------------------------------------- -typedef struct s_setState *setState_t; -typedef struct s_setState { +class s_setState; + +typedef s_setState *setState_t; +class s_setState { + public: container_t container; type_t type; val_t value; -}s_setState_t; + const char* filename; + int linenumber; +}; + +typedef s_setState s_setState_t; -typedef struct s_pushState *pushState_t; -typedef struct s_pushState { +class s_pushState; + +typedef s_pushState *pushState_t; +class s_pushState { + public: container_t container; type_t type; val_t value; int size; + const char* filename; + int linenumber; void* extra; -}s_pushState_t; +}; + +typedef s_pushState s_pushState_t; typedef struct s_popState *popState_t; typedef struct s_popState { @@ -216,169 +257,170 @@ typedef struct s_endLink { char *key; }s_endLink_t; -typedef struct s_newEvent *newEvent_t; -typedef struct s_newEvent { +class s_newEvent; + +typedef s_newEvent *newEvent_t; + +class s_newEvent { + public: 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; +typedef s_newEvent s_newEvent_t; + +extern XBT_PRIVATE xbt_dict_t created_categories; +extern XBT_PRIVATE xbt_dict_t declared_marks; +extern XBT_PRIVATE xbt_dict_t user_host_variables; +extern XBT_PRIVATE xbt_dict_t user_vm_variables; +extern XBT_PRIVATE xbt_dict_t user_link_variables; +extern XBT_PRIVATE double TRACE_last_timestamp_to_dump; /* instr_paje_header.c */ -void TRACE_header(int basic, int size); +XBT_PRIVATE void TRACE_header(int basic, int size); /* from paje.c */ -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); +XBT_PRIVATE void TRACE_paje_init(); +XBT_PRIVATE void TRACE_paje_start(); +XBT_PRIVATE void TRACE_paje_end(); +XBT_PRIVATE void TRACE_paje_dump_buffer (int force); 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); + +// Container 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_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_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 instr_config.c */ -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_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_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); +XBT_PRIVATE bool TRACE_needs_platform (); +XBT_PRIVATE bool TRACE_is_enabled(); +XBT_PRIVATE bool TRACE_platform(); +XBT_PRIVATE bool TRACE_platform_topology(); +XBT_PRIVATE bool TRACE_is_configured(); +XBT_PRIVATE bool TRACE_categorized (); +XBT_PRIVATE bool TRACE_uncategorized (); +XBT_PRIVATE bool TRACE_msg_process_is_enabled(); +XBT_PRIVATE bool TRACE_msg_vm_is_enabled(); +XBT_PRIVATE bool TRACE_buffer (); +XBT_PRIVATE bool TRACE_disable_link(); +XBT_PRIVATE bool TRACE_disable_speed(); +XBT_PRIVATE bool TRACE_onelink_only (); +XBT_PRIVATE bool TRACE_disable_destroy (); +XBT_PRIVATE bool TRACE_basic (); +XBT_PRIVATE bool TRACE_display_sizes (); +XBT_PRIVATE char *TRACE_get_comment (); +XBT_PRIVATE char *TRACE_get_comment_file (); +XBT_PRIVATE int TRACE_precision (); +XBT_PRIVATE char *TRACE_get_filename(); +XBT_PRIVATE char *TRACE_get_viva_uncat_conf (); +XBT_PRIVATE char *TRACE_get_viva_cat_conf (); +XBT_PRIVATE void TRACE_generate_viva_uncat_conf (); +XBT_PRIVATE void TRACE_generate_viva_cat_conf (); +XBT_PRIVATE void instr_pause_tracing (); +XBT_PRIVATE void instr_resume_tracing (); /* 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_view_internals(void); +XBT_PUBLIC(bool) TRACE_smpi_is_enabled(); +XBT_PUBLIC(bool) TRACE_smpi_is_grouped(); +XBT_PUBLIC(bool) TRACE_smpi_is_computing(); +XBT_PUBLIC(bool) TRACE_smpi_is_sleeping(); +XBT_PUBLIC(bool) TRACE_smpi_view_internals(); /* from resource_utilization.c */ -void TRACE_surf_host_set_utilization(const char *resource, - const char *category, - double value, - double now, +XBT_PRIVATE void TRACE_surf_host_set_utilization(const char *resource, const char *category, double value, double now, double delta); -void TRACE_surf_link_set_utilization(const char *resource, - const char *category, - double value, - double now, +XBT_PRIVATE void TRACE_surf_link_set_utilization(const char *resource,const char *category, double value, double now, double delta); -void TRACE_surf_resource_utilization_alloc(void); +XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc(); /* instr_paje.c */ -extern xbt_dict_t trivaNodeTypes; -extern xbt_dict_t trivaEdgeTypes; -long long int instr_new_paje_id (void); -void PJ_container_alloc (void); -void PJ_container_release (void); +extern XBT_PRIVATE xbt_dict_t trivaNodeTypes; +extern XBT_PRIVATE xbt_dict_t trivaEdgeTypes; +XBT_PRIVATE long long int instr_new_paje_id (); +XBT_PRIVATE void PJ_container_alloc (); +XBT_PRIVATE void PJ_container_release (); 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(container_t) PJ_container_get_root (); 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); -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, type_t father); -type_t PJ_type_variable_new (const char *name, const char *color, type_t father); +XBT_PRIVATE void PJ_type_alloc (); +XBT_PRIVATE void PJ_type_release (); +XBT_PUBLIC(type_t) PJ_type_get_root (); +XBT_PRIVATE type_t PJ_type_container_new (const char *name, type_t father); +XBT_PRIVATE type_t PJ_type_event_new (const char *name, 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); +XBT_PRIVATE XBT_PRIVATE type_t PJ_type_variable_new (const char *name, const char *color, type_t father); +XBT_PRIVATE type_t PJ_type_state_new (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); +void PJ_type_free_all (); +XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type); /* instr_paje_values.c */ 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); - - -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); - - - +XBT_PRIVATE void PJ_value_free (val_t value); + +XBT_PRIVATE void print_pajeDefineContainerType(paje_event_t event); +XBT_PRIVATE void print_pajeDefineVariableType(paje_event_t event); +XBT_PRIVATE void print_pajeDefineStateType(paje_event_t event); +XBT_PRIVATE void print_pajeDefineEventType(paje_event_t event); +XBT_PRIVATE void print_pajeDefineLinkType(paje_event_t event); +XBT_PRIVATE void print_pajeDefineEntityValue (paje_event_t event); +XBT_PRIVATE void print_pajeCreateContainer(paje_event_t event); +XBT_PRIVATE void print_pajeDestroyContainer(paje_event_t event); +XBT_PRIVATE void print_pajeSetVariable(paje_event_t event); +XBT_PRIVATE void print_pajeAddVariable(paje_event_t event); +XBT_PRIVATE void print_pajeSubVariable(paje_event_t event); +XBT_PRIVATE void print_pajeSetState(paje_event_t event); +XBT_PRIVATE void print_pajePushState(paje_event_t event); +XBT_PRIVATE void print_pajePopState(paje_event_t event); +XBT_PRIVATE void print_pajeResetState(paje_event_t event); +XBT_PRIVATE void print_pajeStartLink(paje_event_t event); +XBT_PRIVATE void print_pajeEndLink(paje_event_t event); +XBT_PRIVATE void print_pajeNewEvent (paje_event_t event); + +XBT_PRIVATE void print_TIPushState(paje_event_t event); +XBT_PRIVATE void print_TICreateContainer(paje_event_t event); +XBT_PRIVATE void print_TIDestroyContainer(paje_event_t event); +XBT_PRIVATE void TRACE_TI_start(); +XBT_PRIVATE void TRACE_TI_end(); +XBT_PRIVATE void TRACE_TI_init(); + +XBT_PRIVATE void print_NULL (paje_event_t event); +XBT_PRIVATE void TRACE_paje_dump_buffer (int force); +XBT_PRIVATE void dump_comment_file (const char *filename); +XBT_PRIVATE void dump_comment (const char *comment); typedef struct instr_trace_writer { void (*print_DefineContainerType) (paje_event_t event); @@ -401,12 +443,9 @@ typedef struct instr_trace_writer { 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, @@ -420,6 +459,7 @@ typedef enum{ TRACING_RECV, TRACING_IRECV, TRACING_SENDRECV, + TRACING_TEST, TRACING_WAIT, TRACING_WAITALL, TRACING_WAITANY, @@ -437,17 +477,17 @@ typedef enum{ 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; @@ -458,15 +498,6 @@ typedef struct s_instr_extra_data { int num_processes; } s_instr_extra_data_t; -#endif /* HAVE_TRACING */ +SG_END_DECL() -#ifdef HAVE_JEDULE -#include "instr/jedule/jedule_sd_binding.h" #endif - - - - - - -#endif /* INSTR_PRIVATE_H_ */