X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c96825e4f16cdc4c25162b5a11d8b8514344444d..4be24d86416854b0f898f8058b88a4d22c8bcb8e:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 4a95ba3e87..2ecebc2b57 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -69,6 +69,7 @@ public: 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); + ~Type(); static Type* getOrNull(const char* name, Type* father); static Type* containerNew(const char* name, Type* father); static Type* eventNew(const char* name, Type* father); @@ -85,7 +86,6 @@ public: 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); @@ -107,16 +107,19 @@ typedef enum { //-------------------------------------------------- -class s_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 */ - s_container* father_; - xbt_dict_t children_; +class Container { +public: + Container(const char* name, simgrid::instr::e_container_types kind, Container* father); + virtual ~Container(); + + 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_ = 0; /* Level in the hierarchy, root level is 0 */ + e_container_types kind_; /* This container is of what kind */ + Container* father_; + xbt_dict_t children_; }; //-------------------------------------------------- @@ -125,85 +128,63 @@ class PajeEvent { double timestamp_; e_event_type eventType_; 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: - s_container* container; + Container* container; Type* type; double value; public: - SetVariableEvent(double timestamp, s_container* container, Type* type, double value); + SetVariableEvent(double timestamp, Container* container, Type* type, double value); void print() override; }; - class AddVariableEvent:public PajeEvent { private: - s_container* container; + Container* container; Type* type; double value; public: - AddVariableEvent(double timestamp, s_container* container, Type* type, double value); + AddVariableEvent(double timestamp, Container* container, Type* type, double value); void print() override; }; - //-------------------------------------------------- class SubVariableEvent : public PajeEvent { private: - s_container* container; + Container* container; Type* type; double value; public: - SubVariableEvent(double timestamp, s_container* container, Type* type, double value); + SubVariableEvent(double timestamp, Container* container, Type* type, double value); void print() override; }; //-------------------------------------------------- class SetStateEvent : public PajeEvent { private: - s_container* container; + Container* container; Type* type; Value* val; const char* filename; int linenumber; public: - SetStateEvent(double timestamp, s_container* container, Type* type, Value* val); + SetStateEvent(double timestamp, Container* container, Type* type, Value* val); void print() override; }; class PushStateEvent : public PajeEvent { public: - s_container* container; + Container* container; Type* type; Value* val; int size; @@ -212,55 +193,55 @@ class PushStateEvent : public PajeEvent { void* extra_; public: - PushStateEvent(double timestamp, s_container* container, Type* type, Value* val); - PushStateEvent(double timestamp, s_container* container, Type* type, Value* val, void* extra); + 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 { - s_container* container; + Container* container; Type* type; public: - PopStateEvent(double timestamp, s_container* container, Type* type); + PopStateEvent(double timestamp, Container* container, Type* type); void print() override; }; class ResetStateEvent : public PajeEvent { - s_container* container; + Container* container; Type* type; public: - ResetStateEvent(double timestamp, s_container* container, Type* type); + ResetStateEvent(double timestamp, Container* container, Type* type); void print() override; }; class StartLinkEvent : public PajeEvent { public: - s_container* container; + Container* container; Type* type; - s_container* sourceContainer; + Container* sourceContainer; char* value; char* key; int size; public: ~StartLinkEvent(); - StartLinkEvent(double timestamp, s_container* container, Type* type, s_container* sourceContainer, - const char* value, const char* key); - StartLinkEvent(double timestamp, s_container* container, Type* type, s_container* sourceContainer, - const char* value, const char* key, int size); + 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; }; class EndLinkEvent : public PajeEvent { - s_container* container; + Container* container; Type* type; - s_container* destContainer; + Container* destContainer; char *value; char *key; public: - EndLinkEvent(double timestamp, s_container* container, Type* type, s_container* destContainer, const char* value, + EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, const char* value, const char* key); ~EndLinkEvent(); void print() override; @@ -269,17 +250,17 @@ class EndLinkEvent : public PajeEvent { class NewEvent : public PajeEvent { public: - s_container* container; + Container* container; Type* type; Value* val; public: - NewEvent(double timestamp, s_container* container, Type* type, Value* val); + NewEvent(double timestamp, Container* container, Type* type, Value* val); void print() override; }; } } // namespace simgrid::instr -typedef simgrid::instr::s_container* container_t; +typedef simgrid::instr::Container* container_t; SG_BEGIN_DECL() @@ -345,14 +326,10 @@ XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc(); 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, 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(simgrid::instr::Container*) PJ_container_get_or_null(const char* name); 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); @@ -360,11 +337,8 @@ XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container); XBT_PRIVATE void PJ_type_release (); 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(); @@ -437,7 +411,7 @@ extern instr_fmt_type_t instr_fmt_type; SG_END_DECL() -void DefineContainerEvent(simgrid::instr::Type* type); +void LogContainerTypeDefinition(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);