X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/585eeb393ae78877bab30573f224a2171074a6ca..93d4164c9d94cbadae79947ac3f378b08c947390:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index af513ac141..4aa92854ed 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -11,28 +11,36 @@ #include "instr/instr_interface.h" #include "simgrid/instr.h" #include "simgrid_config.h" +#include "src/instr/instr_paje_containers.hpp" +#include "src/instr/instr_paje_types.hpp" #include "src/internal_config.h" +#include "xbt/graph.h" +#include /** std::setprecision **/ #include #include +#include #include - +#include +#ifdef WIN32 +#include // _mkdir /* 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 -#define INSTR_DEFAULT_STR_SIZE 500 - -#include "xbt/dict.h" -#include "xbt/graph.h" - namespace simgrid { namespace instr { -class Value; +class Container; +class Type; +class EntityValue; +class ContainerType; +class EventType; +class LinkType; +class StateType; +class VariableType; -enum e_event_type { +enum e_event_type : unsigned int { PAJE_DefineContainerType, PAJE_DefineVariableType, PAJE_DefineStateType, @@ -53,87 +61,20 @@ enum e_event_type { PAJE_NewEvent }; -enum e_entity_types { TYPE_VARIABLE, TYPE_LINK, TYPE_CONTAINER, TYPE_STATE, TYPE_EVENT }; - -//-------------------------------------------------- - -class Type { - std::string id_; +class EntityValue { + long long int id_; std::string name_; - -public: std::string color_; - e_entity_types kind_; Type* father_; - std::map children_; - std::map values_; // valid for all types except variable and container - Type(std::string name, const char* key, std::string color, e_entity_types kind, Type* father); - ~Type(); - Type* getChild(std::string name); - Type* getChildOrNull(std::string name); - - static Type* containerNew(const char* name, Type* father); - static Type* eventNew(const char* name, Type* father); - static Type* variableNew(const char* name, std::string color, Type* father); - static Type* linkNew(const char* name, Type* father, Type* source, Type* dest); - static Type* stateNew(const char* name, Type* father); - std::string getName() { return name_; } - const char* getCname() { return name_.c_str(); } - const char* getId() { return id_.c_str(); } - bool isColored() { return not color_.empty(); } -}; - -//-------------------------------------------------- -class Value { - std::string name_; - std::string id_; - std::string color_; - - explicit Value(std::string name, std::string color, Type* father); public: - ~Value() = default; - Type* father_; - static Value* byNameOrCreate(std::string name, std::string color, Type* father); - static Value* byName(std::string name, Type* father); + explicit EntityValue(std::string name, std::string color, Type* father); + ~EntityValue() = default; const char* getCname() { return name_.c_str(); } - const char* getId() { return id_.c_str(); } - bool isColored() { return not color_.empty(); } + long long int getId() { return id_; } void print(); }; -//-------------------------------------------------- -enum e_container_types { - INSTR_HOST, - INSTR_LINK, - INSTR_ROUTER, - INSTR_AS, - INSTR_SMPI, - INSTR_MSG_VM, - INSTR_MSG_PROCESS, - INSTR_MSG_TASK -}; - -//-------------------------------------------------- - -class Container { -public: - Container(std::string name, simgrid::instr::e_container_types kind, Container* father); - virtual ~Container(); - - sg_netpoint_t netpoint_; - std::string name_; /* Unique name of this container */ - std::string 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_; - std::map children_; - static simgrid::instr::Container* byNameOrNull(std::string name); - static simgrid::instr::Container* byName(std::string name); -}; - -//-------------------------------------------------- class PajeEvent { protected: Container* container; @@ -149,64 +90,24 @@ public: void insertIntoBuffer(); }; -//-------------------------------------------------- -class SetVariableEvent : public PajeEvent { - double value; - -public: - SetVariableEvent(double timestamp, Container* container, Type* type, double value); - void print() override; -}; - -class AddVariableEvent : public PajeEvent { +class VariableEvent : public PajeEvent { double value; public: - AddVariableEvent(double timestamp, Container* container, Type* type, double value); + VariableEvent(double timestamp, Container* container, Type* type, e_event_type event_type, double value); void print() override; }; -//-------------------------------------------------- -class SubVariableEvent : public PajeEvent { - double value; - -public: - SubVariableEvent(double timestamp, Container* container, Type* type, double value); - void print() override; -}; -//-------------------------------------------------- - -class SetStateEvent : public PajeEvent { - Value* value; - const char* filename; +class StateEvent : public PajeEvent { + EntityValue* value; + std::string filename; int linenumber; + void* extra_ = nullptr; public: - SetStateEvent(double timestamp, Container* container, Type* type, Value* val); - void print() override; -}; - -class PushStateEvent : public PajeEvent { - Value* value; - 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 { -public: - PopStateEvent(double timestamp, Container* container, Type* type); - void print() override; -}; - -class ResetStateEvent : public PajeEvent { -public: - ResetStateEvent(double timestamp, Container* container, Type* type); + StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value); + StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value, + void* extra); void print() override; }; @@ -237,10 +138,10 @@ public: }; class NewEvent : public PajeEvent { - Value* val; + EntityValue* val; public: - NewEvent(double timestamp, Container* container, Type* type, Value* val); + NewEvent(double timestamp, Container* container, Type* type, EntityValue* val); void print() override; }; } @@ -257,12 +158,11 @@ 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); +XBT_PRIVATE void TRACE_header(bool basic, int size); /* from paje.c */ 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 */ XBT_PRIVATE bool TRACE_needs_platform(); @@ -310,20 +210,18 @@ 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_PUBLIC(container_t) PJ_container_get_root (); -XBT_PUBLIC(void) PJ_container_set_root (container_t root); -XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container); - -/* instr_paje_types.c */ -XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get_root(); +void instr_new_variable_type(std::string new_typename, std::string color); +void instr_new_user_variable_type(std::string father_type, std::string new_typename, std::string color); +void instr_new_user_state_type(std::string father_type, std::string new_typename); +void instr_new_value_for_user_state_type(std::string new_typename, const char* value, std::string color); /* instr_config.c */ 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); +XBT_PRIVATE void TRACE_paje_dump_buffer(bool force); +XBT_PRIVATE void dump_comment_file(std::string filename); +XBT_PRIVATE void dump_comment(std::string comment); enum e_caller_type { TRACING_INIT, @@ -388,12 +286,4 @@ enum instr_fmt_type_t { instr_fmt_paje, instr_fmt_TI }; extern instr_fmt_type_t instr_fmt_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); -void LogContainerCreation(container_t container); -void LogContainerDestruction(container_t container); -void LogDefineEventType(simgrid::instr::Type* type); - #endif