X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c175e94f648203d491634a64f4f31ac83a2e475..962510fd94a2c10c6873d41acdf2798a8af7f706:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index b158f63d2d..4eb5eee1ab 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -12,24 +12,26 @@ #include "simgrid/instr.h" #include "simgrid_config.h" #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 { -typedef enum { + +class Value; + +enum e_event_type { PAJE_DefineContainerType, PAJE_DefineVariableType, PAJE_DefineStateType, @@ -48,84 +50,107 @@ typedef enum { PAJE_StartLink, PAJE_EndLink, PAJE_NewEvent -} e_event_type; - -typedef enum { TYPE_VARIABLE, TYPE_LINK, TYPE_CONTAINER, TYPE_STATE, TYPE_EVENT } e_entity_types; +}; //-------------------------------------------------- +enum e_entity_types { TYPE_VARIABLE, TYPE_LINK, TYPE_CONTAINER, TYPE_STATE, TYPE_EVENT }; class Type { -public: - char* id_; - char* name_; - char* color_; - + std::string id_; + std::string name_; + std::string 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); + +public: + std::map children_; + std::map values_; // valid for all types except variable and container + + Type(std::string name, std::string alias, std::string color, e_entity_types kind, Type* father); ~Type(); - Type* getChild(const char* name); - Type* getChildOrNull(const char* name); - - 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); + + std::string getName() { return name_; } + const char* getCname() { return name_.c_str(); } + const char* getId() { return id_.c_str(); } + e_entity_types getKind() { return kind_; } + bool isColored() { return not color_.empty(); } + + Type* byName(std::string name); + + Type* getOrCreateContainerType(std::string name); + Type* getOrCreateEventType(std::string name); + Type* getOrCreateLinkType(std::string name, Type* source, Type* dest); + Type* getOrCreateStateType(std::string name); + Type* getOrCreateVariableType(std::string name, std::string color); + + void addEntityValue(std::string name, std::string color); + void addEntityValue(std::string name); + Value* getEntityValue(std::string name); + + void logContainerTypeDefinition(); + void logVariableTypeDefinition(); + void logStateTypeDefinition(); + void logLinkTypeDefinition(simgrid::instr::Type* source, simgrid::instr::Type* dest); + void logDefineEventType(); + + static Type* createRootType(); + static Type* getRootType(); }; -//-------------------------------------------------- class Value { -private: std::string name_; std::string id_; std::string color_; - - explicit Value(std::string name, std::string color, Type* father); + 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 Value(std::string name, std::string color, Type* father); + ~Value(); const char* getCname() { return name_.c_str(); } const char* getId() { return id_.c_str(); } bool isColored() { return not color_.empty(); } void print(); }; -//-------------------------------------------------- -typedef enum { - INSTR_HOST, - INSTR_LINK, - INSTR_ROUTER, - INSTR_AS, - INSTR_SMPI, - INSTR_MSG_VM, - INSTR_MSG_PROCESS, - INSTR_MSG_TASK -} e_container_types; - -//-------------------------------------------------- - class Container { + long long int id_; + std::string name_; /* Unique name of this container */ public: - Container(std::string name, simgrid::instr::e_container_types kind, Container* father); + Container(std::string name, std::string type_name, 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_; + sg_netpoint_t netpoint_ = nullptr; + + static Container* byNameOrNull(std::string name); + static Container* byName(std::string name); + std::string getName() { return name_; } + const char* getCname() { return name_.c_str(); } + long long int getId() { return id_; } + void removeFromParent(); + void logCreation(); + void logDestruction(); + + static Container* getRootContainer(); +}; + +class NetZoneContainer : public Container { +public: + NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father); +}; + +class RouterContainer : public Container { +public: + RouterContainer(std::string name, Container* father); +}; + +class HostContainer : public Container { +public: + HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father); }; -//-------------------------------------------------- class PajeEvent { protected: Container* container; @@ -138,6 +163,7 @@ public: : container(container), type(type), timestamp_(timestamp), eventType_(eventType){}; virtual void print() = 0; virtual ~PajeEvent(); + void insertIntoBuffer(); }; //-------------------------------------------------- @@ -208,10 +234,10 @@ class StartLinkEvent : public PajeEvent { int size_; public: - 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); + StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, std::string value, + std::string key); + StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, std::string value, + std::string key, int size); void print() override; }; @@ -248,12 +274,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(); @@ -301,27 +326,20 @@ 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(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_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); - -struct s_instr_extra_data; -typedef struct s_instr_extra_data* instr_extra_data; +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); -typedef enum { +enum e_caller_type { TRACING_INIT, TRACING_FINALIZE, TRACING_COMM_SIZE, @@ -355,9 +373,9 @@ typedef enum { TRACING_SLEEPING, TRACING_SCAN, TRACING_EXSCAN -} e_caller_type; +}; -typedef struct s_instr_extra_data { +struct s_instr_extra_data_t { e_caller_type type; int send_size; int recv_size; @@ -371,7 +389,8 @@ typedef struct s_instr_extra_data { int* sendcounts; int* recvcounts; int num_processes; -} s_instr_extra_data_t; +}; +typedef s_instr_extra_data_t* instr_extra_data; /* Format of TRACING output. * - paje is the regular format, that we all know @@ -379,16 +398,8 @@ typedef struct s_instr_extra_data { * 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; +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