X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5418e2f161ecfa4af596fb3d25e8ac696935af3..269a0c0c0c78a2e995314fae27468e1179286b02:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index bc9a49c044..6d03b70991 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -14,8 +14,6 @@ #include "src/internal_config.h" #include -SG_BEGIN_DECL() - /* Need to define function drand48 for Windows */ /* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */ #ifdef _WIN32 @@ -27,6 +25,8 @@ SG_BEGIN_DECL() #include "xbt/graph.h" #include "xbt/dict.h" +namespace simgrid { +namespace instr { typedef enum { PAJE_DefineContainerType, PAJE_DefineVariableType, @@ -60,14 +60,14 @@ typedef enum { 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 + 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); @@ -80,12 +80,12 @@ public: //-------------------------------------------------- class Value { public: - char* id; - char* name; - char* color; + char* id_; + char* name_; + char* color_; - Type* father; - Value* ret; + 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); @@ -106,157 +106,139 @@ typedef enum { } e_container_types; //-------------------------------------------------- -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* 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: + 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 event_type; - virtual void print() = 0; - void *data; - virtual ~PajeEvent(); + double timestamp_; + e_event_type eventType_; + virtual void print() = 0; + 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; + Container* container; + Type* type; + double value; + public: - SetVariableEvent(double timestamp, container_t container, Type* type, double value); + SetVariableEvent(double timestamp, Container* container, Type* type, double value); void print() override; }; - class AddVariableEvent:public PajeEvent { private: - container_t container; - Type* type; - double value; + Container* container; + Type* type; + double value; + public: - AddVariableEvent(double timestamp, container_t container, Type* type, double value); + AddVariableEvent(double timestamp, Container* container, Type* type, double value); void print() override; }; - //-------------------------------------------------- class SubVariableEvent : public PajeEvent { private: - container_t container; - Type* type; - double value; + Container* container; + Type* type; + double value; + public: - SubVariableEvent(double timestamp, container_t container, Type* type, double value); + SubVariableEvent(double timestamp, Container* 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; + Container* container; + Type* type; + Value* val; + const char* filename; + int linenumber; + public: - SetStateEvent(double timestamp, container_t container, Type* type, Value* val); + SetStateEvent(double timestamp, Container* container, Type* type, Value* val); void print() override; }; class PushStateEvent : public PajeEvent { public: - container_t container; - Type* type; - Value* val; - int size; - const char* filename; - int linenumber; - void* extra_; + Container* 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); + 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_t container; + Container* container; Type* type; public: - PopStateEvent(double timestamp, container_t container, Type* type); + PopStateEvent(double timestamp, Container* container, Type* type); void print() override; }; class ResetStateEvent : public PajeEvent { - container_t container; + Container* container; Type* type; public: - ResetStateEvent(double timestamp, container_t container, Type* type); + ResetStateEvent(double timestamp, Container* 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; + Container* container; + Type* type; + Container* sourceContainer; + char* value; + char* key; + int size; + public: ~StartLinkEvent(); - StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value, + StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value, const char* key); - StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value, + StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value, const char* key, int size); void print() override; }; class EndLinkEvent : public PajeEvent { - container_t container; + Container* container; Type* type; - container_t destContainer; + Container* destContainer; char *value; char *key; public: - EndLinkEvent(double timestamp, container_t container, Type* type, container_t destContainer, const char* value, + EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, const char* value, const char* key); ~EndLinkEvent(); void print() override; @@ -265,15 +247,19 @@ class EndLinkEvent : public PajeEvent { 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; + Container* container; + Type* type; + Value* val; + public: + NewEvent(double timestamp, Container* container, Type* type, Value* val); + void print() override; }; +} +} // namespace simgrid::instr +typedef simgrid::instr::Container* container_t; + +SG_BEGIN_DECL() extern XBT_PRIVATE std::set created_categories; extern XBT_PRIVATE std::set declared_marks; @@ -339,7 +325,7 @@ 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 (); @@ -350,12 +336,12 @@ XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container); /* instr_paje_types.c */ 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); +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(Type* type); +XBT_PRIVATE void recursiveDestroyType(simgrid::instr::Type* type); XBT_PRIVATE void TRACE_TI_start(); XBT_PRIVATE void TRACE_TI_end(); @@ -429,13 +415,13 @@ 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 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(Type* type); +void LogDefineEventType(simgrid::instr::Type* type); #endif