X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9a0e9bc5955dc35cdce96dfdee9ab09fcb0d25e..c5418e2f161ecfa4af596fb3d25e8ac696935af3:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 07f7dce75d..bc9a49c044 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -1,19 +1,23 @@ -/* Copyright (c) 2010. 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 "instr/instr_interface.h" +#include "simgrid/instr.h" #include "simgrid_config.h" +#include "src/internal_config.h" +#include -#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 @@ -22,7 +26,6 @@ #include "xbt/graph.h" #include "xbt/dict.h" -#include "simgrid/platf.h" typedef enum { PAJE_DefineContainerType, @@ -53,25 +56,44 @@ typedef enum { TYPE_EVENT } e_entity_types; -typedef struct s_type *type_t; -typedef struct s_type { +//-------------------------------------------------- + +class Type { +public: char *id; char *name; char *color; + e_entity_types kind; - struct s_type *father; + Type *father; xbt_dict_t children; xbt_dict_t values; //valid for all types except variable and container -}s_type_t; + Type(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind, Type* father); + static Type* getOrNull(const char* name, Type* father); + static Type* containerNew(const char* name, Type* father); + static Type* eventNew(const char* name, Type* father); + static Type* variableNew(const char* name, const char* color, Type* father); + static Type* linkNew(const char* name, Type* father, Type* source, Type* dest); + static Type* stateNew(const char* name, Type* father); +}; -typedef struct s_val *val_t; -typedef struct s_val { - char *id; - char *name; - char *color; - type_t father; -}s_val_t; +//-------------------------------------------------- +class Value { +public: + char* id; + char* name; + char* color; + Type* father; + Value* ret; + Value(const char* name, const char* color, Type* father); + ~Value(); + static Value* get_or_new(const char* name, const char* color, Type* father); + static Value* get(const char* name, Type* father); +}; + + +//-------------------------------------------------- typedef enum { INSTR_HOST, INSTR_LINK, @@ -83,137 +105,337 @@ 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 */ + Type* 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; +}; + +//-------------------------------------------------- +class PajeEvent { + public: + double timestamp; + e_event_type event_type; + virtual void print() = 0; + void *data; + virtual ~PajeEvent(); +}; + +//-------------------------------------------------- + +class DefineVariableTypeEvent : public PajeEvent +{ + public: + Type* type; + DefineVariableTypeEvent(Type* type); + void print() override; +}; +//-------------------------------------------------- + +class DefineStateTypeEvent : public PajeEvent { + Type* type; + +public: + DefineStateTypeEvent(Type* type); + void print() override; +}; + + +class SetVariableEvent : public PajeEvent { + private: + container_t container; + Type* type; + double value; + public: + SetVariableEvent(double timestamp, container_t container, Type* type, double value); + void print() override; +}; + + +class AddVariableEvent:public PajeEvent { + private: + container_t container; + Type* type; + double value; + public: + AddVariableEvent(double timestamp, container_t container, Type* type, double value); + void print() override; +}; + +//-------------------------------------------------- + + +class SubVariableEvent : public PajeEvent { + private: + container_t container; + Type* type; + double value; + public: + SubVariableEvent(double timestamp, container_t container, Type* type, double value); + void print() override; +}; +//-------------------------------------------------- + +class SetStateEvent : public PajeEvent { + private: + container_t container; + Type* type; + Value* val; + const char* filename; + int linenumber; + public: + SetStateEvent(double timestamp, container_t container, Type* type, Value* val); + void print() override; +}; + -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; +class PushStateEvent : public PajeEvent { + public: + container_t container; + Type* type; + Value* val; + int size; + const char* filename; + int linenumber; + void* extra_; + public: + PushStateEvent(double timestamp, container_t container, Type* type, Value* val); + PushStateEvent(double timestamp, container_t container, Type* type, Value* val, void* extra); + void print() override; +}; + +class PopStateEvent : public PajeEvent { + container_t container; + Type* type; + +public: + PopStateEvent(double timestamp, container_t container, Type* type); + void print() override; +}; + +class ResetStateEvent : public PajeEvent { + container_t container; + Type* type; + +public: + ResetStateEvent(double timestamp, container_t container, Type* type); + void print() override; +}; + +class StartLinkEvent : public PajeEvent { + public: + container_t container; + Type* type; + container_t sourceContainer; + char *value; + char *key; + int size; + public: + ~StartLinkEvent(); + StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value, + const char* key); + StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value, + const char* key, int size); + void print() override; +}; + +class EndLinkEvent : public PajeEvent { + container_t container; + Type* type; + container_t destContainer; + char *value; + char *key; + public: + EndLinkEvent(double timestamp, container_t container, Type* type, container_t destContainer, const char* value, + const char* key); + ~EndLinkEvent(); + void print() override; +}; + + +class NewEvent : public PajeEvent { + public: + container_t container; + Type* type; + Value* val; + +public: + NewEvent(double timestamp, container_t container, Type* type, Value* val); + void print() override; + +}; + +extern XBT_PRIVATE std::set created_categories; +extern XBT_PRIVATE std::set declared_marks; +extern XBT_PRIVATE std::set user_host_variables; +extern XBT_PRIVATE std::set user_vm_variables; +extern XBT_PRIVATE std::set user_link_variables; +extern XBT_PRIVATE double TRACE_last_timestamp_to_dump; /* instr_paje_header.c */ -void TRACE_header(int basic); +XBT_PRIVATE void TRACE_header(int basic, int size); /* from paje.c */ -void TRACE_paje_start(void); -void TRACE_paje_end(void); -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); -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_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_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); +XBT_PRIVATE void TRACE_paje_start(); +XBT_PRIVATE void TRACE_paje_end(); +XBT_PRIVATE void TRACE_paje_dump_buffer (int force); + /* 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); -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(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 std::set trivaNodeTypes; +extern XBT_PRIVATE std::set 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); -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_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 */ -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); - -#endif /* HAVE_TRACING */ - -#ifdef HAVE_JEDULE -#include "instr/jedule/jedule_sd_binding.h" -#endif +XBT_PRIVATE void PJ_type_release (); +XBT_PUBLIC(Type*) PJ_type_get_root(); +XBT_PUBLIC(Type*) PJ_type_get(const char* name, Type* father); +XBT_PRIVATE XBT_PRIVATE void PJ_type_free(Type* type); + +/* instr_config.c */ +XBT_PRIVATE void recursiveDestroyType(Type* type); + +XBT_PRIVATE void TRACE_TI_start(); +XBT_PRIVATE void TRACE_TI_end(); + +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); + +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 ; -#endif /* INSTR_PRIVATE_H_ */ +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; + +/* Format of TRACING output. + * - paje is the regular format, that we all know + * - TI is a trick to reuse the tracing functions to generate a time independent trace during the execution. Such trace can easily be replayed with smpi_replay afterward. + * This trick should be removed and replaced by some code using the signal that we will create to cleanup the TRACING + */ +typedef enum { instr_fmt_paje, instr_fmt_TI } instr_fmt_type_t; +extern instr_fmt_type_t instr_fmt_type; + +SG_END_DECL() + +void DefineContainerEvent(Type* type); +void LogVariableTypeDefinition(Type* type); +void LogStateTypeDefinition(Type* type); +void LogLinkTypeDefinition(Type* type, Type* source, Type* dest); +void LogEntityValue(Value* val); +void LogContainerCreation (container_t container); +void LogContainerDestruction (container_t container); +void LogDefineEventType(Type* type); + +#endif