X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/35dd4121018e3122bff5ae2b111da429a9740049..962510fd94a2c10c6873d41acdf2798a8af7f706:/src/instr/instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 23ee0773f8..4eb5eee1ab 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -26,8 +26,6 @@
 #define drand48() (rand() / (RAND_MAX + 1.0))
 #endif
 
-#define INSTR_DEFAULT_STR_SIZE 500
-
 namespace simgrid {
 namespace instr {
 
@@ -79,10 +77,15 @@ public:
 
   Type* byName(std::string name);
 
-  Type* addEventType(std::string name);
-  Type* addLinkType(std::string name, Type* source, Type* dest);
-  Type* addStateType(std::string name);
-  Type* addVariableType(std::string name, std::string color);
+  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();
@@ -90,63 +93,64 @@ public:
   void logLinkTypeDefinition(simgrid::instr::Type* source, simgrid::instr::Type* dest);
   void logDefineEventType();
 
-  Type* getChildOrNull(std::string name);
-  static Type* containerNew(const char* name, Type* father);
+  static Type* createRootType();
+  static Type* getRootType();
 };
 
-//--------------------------------------------------
 class Value {
   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();
 };
 
-//--------------------------------------------------
-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 {
-  e_container_types kind_; /* This container is of what kind */
-  int level_ = 0;          /* Level in the hierarchy, root level is 0 */
-
+  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_ = nullptr;
-  std::string name_;       /* Unique name of this container */
-  std::string id_;         /* Unique id of this container */
   Type* type_;             /* Type of this container */
   Container* father_;
   std::map<std::string, Container*> 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;
@@ -322,19 +326,18 @@ XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc();
 extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
 extern XBT_PRIVATE std::set<std::string> 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);
-
-/* 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(bool force);
-XBT_PRIVATE void dump_comment_file(const char* filename);
-XBT_PRIVATE void dump_comment(const char* comment);
+XBT_PRIVATE void dump_comment_file(std::string filename);
+XBT_PRIVATE void dump_comment(std::string comment);
 
 enum e_caller_type {
   TRACING_INIT,