X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd89cc2577e61b4b86b1ae7bc58dfa2ad00747e6..e00238722aae4bbe44ad6a2d2952fe33c110de79:/src/instr/instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 4c1136d52c..97b9e9b78a 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -11,6 +11,8 @@
 #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 <iomanip> /** std::setprecision **/
@@ -29,9 +31,16 @@
 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,
@@ -52,103 +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_;
-  std::string name_;
-  std::string color_;
-  e_entity_types kind_;
-  Type* father_;
-
-public:
-  std::map<std::string, Type*> children_;
-  std::map<std::string, Value*> 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();
-
-  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 {
+class EntityValue {
+  long long int id_;
   std::string name_;
-  std::string id_;
   std::string color_;
   Type* father_;
 
 public:
-  explicit Value(std::string name, std::string color, Type* father);
-  ~Value();
+  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 {
-  e_container_types kind_; /* This container is of what kind */
-  std::string name_;       /* Unique name of this container */
-  int level_ = 0;          /* Level in the hierarchy, root level is 0 */
-  sg_netpoint_t netpoint_ = nullptr;
-
-public:
-  Container(std::string name, simgrid::instr::e_container_types kind, Container* father);
-  virtual ~Container();
-
-  std::string id_;         /* Unique id of this container */
-  Type* type_;             /* Type of this container */
-  Container* father_;
-  std::map<std::string, Container*> children_;
-  static Container* byNameOrNull(std::string name);
-  static Container* byName(std::string name);
-  std::string getName() { return name_; }
-  const char* getCname() { return name_.c_str(); }
-  void removeFromParent();
-  void logCreation();
-  void logDestruction();
-};
-
-//--------------------------------------------------
 class PajeEvent {
 protected:
   Container* container;
@@ -159,69 +85,29 @@ public:
   e_event_type eventType_;
   PajeEvent(Container* container, Type* type, double timestamp, e_event_type eventType)
       : container(container), type(type), timestamp_(timestamp), eventType_(eventType){};
-  virtual void print() = 0;
   virtual ~PajeEvent();
+  virtual void print() = 0;
   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 {
-  double value;
-
-public:
-  AddVariableEvent(double timestamp, Container* container, Type* type, double value);
-  void print() override;
-};
-//--------------------------------------------------
-
-class SubVariableEvent : public PajeEvent {
+class VariableEvent : public PajeEvent {
   double value;
 
 public:
-  SubVariableEvent(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 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;
 };
 
@@ -252,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;
 };
 }
@@ -324,8 +210,6 @@ 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);
 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);