X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c632e6d9666d84954ec453ec95ec8ec38ad58a40..269a0c0c0c78a2e995314fae27468e1179286b02:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 3a6b86e84b..6d03b70991 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -8,12 +8,11 @@ #include -#include "simgrid/instr.h" #include "instr/instr_interface.h" -#include "src/internal_config.h" +#include "simgrid/instr.h" #include "simgrid_config.h" - -SG_BEGIN_DECL() +#include "src/internal_config.h" +#include /* Need to define function drand48 for Windows */ /* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */ @@ -26,6 +25,8 @@ SG_BEGIN_DECL() #include "xbt/graph.h" #include "xbt/dict.h" +namespace simgrid { +namespace instr { typedef enum { PAJE_DefineContainerType, PAJE_DefineVariableType, @@ -55,31 +56,44 @@ typedef enum { TYPE_EVENT } e_entity_types; -typedef struct s_type *type_t; -typedef struct s_type { - char *id; - char *name; - char *color; - e_entity_types kind; - struct s_type *father; - xbt_dict_t children; - xbt_dict_t values; //valid for all types except variable and container -}s_type_t; - -class s_val; - -typedef s_val *val_t; +//-------------------------------------------------- + +class Type { +public: + char* id_; + char* name_; + char* color_; + + e_entity_types kind_; + Type* father_; + xbt_dict_t children_; + xbt_dict_t values_; // valid for all types except variable and container + 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); +}; -class s_val { - public: - char *id; - char *name; - char *color; - type_t father; +//-------------------------------------------------- +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 s_val s_val_t; +//-------------------------------------------------- typedef enum { INSTR_HOST, INSTR_LINK, @@ -91,215 +105,177 @@ typedef enum { INSTR_MSG_TASK } e_container_types; -typedef struct s_container *container_t; -typedef struct s_container { - 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; - xbt_dict_t children; -}s_container_t; +//-------------------------------------------------- + +class Container { +public: + sg_netpoint_t netpoint_; + char* name_; /* Unique name of this container */ + char* id_; /* Unique id 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 */ + Container* father_; + xbt_dict_t children_; +}; + +//-------------------------------------------------- +class PajeEvent { + public: + double timestamp_; + e_event_type eventType_; + virtual void print() = 0; + virtual ~PajeEvent(); +}; + +//-------------------------------------------------- +class SetVariableEvent : public PajeEvent { + private: + Container* container; + Type* type; + double value; + + public: + SetVariableEvent(double timestamp, Container* container, Type* type, double value); + void print() override; +}; + +class AddVariableEvent:public PajeEvent { + private: + Container* container; + Type* type; + double value; + + public: + AddVariableEvent(double timestamp, Container* container, Type* type, double value); + void print() override; +}; +//-------------------------------------------------- + +class SubVariableEvent : public PajeEvent { + private: + Container* container; + Type* type; + double value; -class paje_event; + public: + SubVariableEvent(double timestamp, Container* container, Type* type, double value); + void print() override; +}; +//-------------------------------------------------- -typedef paje_event *paje_event_t; +class SetStateEvent : public PajeEvent { + private: + Container* container; + Type* type; + Value* val; + const char* filename; + int linenumber; -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; + SetStateEvent(double timestamp, Container* container, Type* type, Value* val); + void print() override; }; -typedef paje_event 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; - -class s_setState; - -typedef s_setState *setState_t; -class s_setState { + +class PushStateEvent : public PajeEvent { public: - container_t container; - type_t type; - val_t value; - const char* filename; - int linenumber; + Container* container; + Type* type; + Value* val; + int size; + const char* filename; + int linenumber; + void* extra_; + + public: + PushStateEvent(double timestamp, Container* container, Type* type, Value* val); + PushStateEvent(double timestamp, Container* container, Type* type, Value* val, void* extra); + void print() override; +}; + +class PopStateEvent : public PajeEvent { + Container* container; + Type* type; + +public: + PopStateEvent(double timestamp, Container* container, Type* type); + void print() override; }; -typedef s_setState s_setState_t; +class ResetStateEvent : public PajeEvent { + Container* container; + Type* type; + +public: + ResetStateEvent(double timestamp, Container* container, Type* type); + void print() override; +}; -class s_pushState; +class StartLinkEvent : public PajeEvent { + public: + Container* container; + Type* type; + Container* sourceContainer; + char* value; + char* key; + int size; -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; + ~StartLinkEvent(); + StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value, + const char* key); + StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value, + const char* key, int size); + void print() override; }; -typedef s_pushState 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; +class EndLinkEvent : public PajeEvent { + Container* container; + Type* type; + Container* destContainer; 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; + public: + EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, const char* value, + const char* key); + ~EndLinkEvent(); + void print() override; +}; -class s_newEvent; -typedef s_newEvent *newEvent_t; +class NewEvent : public PajeEvent { + public: + Container* container; + Type* type; + Value* val; -class s_newEvent { public: - container_t container; - type_t type; - val_t value; + NewEvent(double timestamp, Container* container, Type* type, Value* val); + void print() override; }; +} +} // namespace simgrid::instr +typedef simgrid::instr::Container* container_t; -typedef s_newEvent s_newEvent_t; +SG_BEGIN_DECL() -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 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 */ XBT_PRIVATE void TRACE_header(int basic, int size); /* from paje.c */ -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_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); + /* from instr_config.c */ XBT_PRIVATE bool TRACE_needs_platform (); @@ -344,12 +320,12 @@ XBT_PRIVATE void TRACE_surf_link_set_utilization(const char *resource,const char XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc(); /* instr_paje.c */ -extern XBT_PRIVATE xbt_dict_t trivaNodeTypes; -extern XBT_PRIVATE xbt_dict_t trivaEdgeTypes; +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_new(const char* name, simgrid::instr::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 (); @@ -359,77 +335,21 @@ XBT_PUBLIC(void) PJ_container_free_all (void); XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container); /* instr_paje_types.c */ -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); -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_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); -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_PUBLIC(simgrid::instr::Type*) PJ_type_get_root(); +XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get(const char* name, simgrid::instr::Type* father); +XBT_PRIVATE XBT_PRIVATE void PJ_type_free(simgrid::instr::Type* type); + +/* instr_config.c */ +XBT_PRIVATE void recursiveDestroyType(simgrid::instr::Type* type); + 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); - 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; @@ -485,6 +405,23 @@ typedef struct s_instr_extra_data { 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(simgrid::instr::Type* type); +void LogVariableTypeDefinition(simgrid::instr::Type* type); +void LogStateTypeDefinition(simgrid::instr::Type* type); +void LogLinkTypeDefinition(simgrid::instr::Type* type, simgrid::instr::Type* source, simgrid::instr::Type* dest); +void LogEntityValue(simgrid::instr::Value* val); +void LogContainerCreation (container_t container); +void LogContainerDestruction (container_t container); +void LogDefineEventType(simgrid::instr::Type* type); + #endif