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

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 23ee0773f8..60e6bcab17 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -11,6 +11,10 @@
 #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_events.hpp"
+#include "src/instr/instr_paje_types.hpp"
+#include "src/instr/instr_paje_values.hpp"
 #include "src/internal_config.h"
 #include "xbt/graph.h"
 #include <iomanip> /** std::setprecision **/
@@ -26,238 +30,6 @@
 #define drand48() (rand() / (RAND_MAX + 1.0))
 #endif
 
-#define INSTR_DEFAULT_STR_SIZE 500
-
-namespace simgrid {
-namespace instr {
-
-class Value;
-
-enum e_event_type {
-  PAJE_DefineContainerType,
-  PAJE_DefineVariableType,
-  PAJE_DefineStateType,
-  PAJE_DefineEventType,
-  PAJE_DefineLinkType,
-  PAJE_DefineEntityValue,
-  PAJE_CreateContainer,
-  PAJE_DestroyContainer,
-  PAJE_SetVariable,
-  PAJE_AddVariable,
-  PAJE_SubVariable,
-  PAJE_SetState,
-  PAJE_PushState,
-  PAJE_PopState,
-  PAJE_ResetState,
-  PAJE_StartLink,
-  PAJE_EndLink,
-  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* 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);
-
-  void logContainerTypeDefinition();
-  void logVariableTypeDefinition();
-  void logStateTypeDefinition();
-  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);
-};
-
-//--------------------------------------------------
-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);
-  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 */
-
-public:
-  Container(std::string name, simgrid::instr::e_container_types kind, 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_;
-  static Container* byNameOrNull(std::string name);
-  static Container* byName(std::string name);
-  void removeFromParent();
-  void logCreation();
-  void logDestruction();
-};
-
-//--------------------------------------------------
-class PajeEvent {
-protected:
-  Container* container;
-  Type* type;
-
-public:
-  double timestamp_;
-  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();
-  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 {
-  double value;
-
-public:
-  SubVariableEvent(double timestamp, Container* container, Type* type, double value);
-  void print() override;
-};
-//--------------------------------------------------
-
-class SetStateEvent : public PajeEvent {
-  Value* value;
-  const char* filename;
-  int linenumber;
-
-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);
-  void print() override;
-};
-
-class StartLinkEvent : public PajeEvent {
-  Container* sourceContainer_;
-  std::string value_;
-  std::string key_;
-  int size_;
-
-public:
-  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;
-};
-
-class EndLinkEvent : public PajeEvent {
-  Container* destContainer;
-  std::string value;
-  std::string key;
-
-public:
-  EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, std::string value,
-               std::string key);
-  ~EndLinkEvent() = default;
-  void print() override;
-};
-
-class NewEvent : public PajeEvent {
-  Value* val;
-
-public:
-  NewEvent(double timestamp, Container* container, Type* type, Value* val);
-  void print() override;
-};
-}
-} // namespace simgrid::instr
 typedef simgrid::instr::Container* container_t;
 
 extern "C" {
@@ -322,19 +94,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,