X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e3b2f1d55a07271c05db2ed5b3fec27561097f9..8e579781408282aaead93a271b6bb8855ba87603:/src/instr/instr_paje_types.hpp

diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index 21a440a45e..a5e31d40c7 100644
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,7 +7,7 @@
 #define INSTR_PAJE_TYPES_HPP
 
 #include "src/instr/instr_private.hpp"
-#include <sstream>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -16,52 +16,65 @@ namespace instr {
 class ContainerType;
 class EventType;
 
+long long int new_paje_id();
+
 class Type {
-  long long int id_;
+  long long int id_ = new_paje_id();
   std::string name_;
   std::string color_;
   Type* father_;
+  std::map<std::string, std::unique_ptr<Type>, std::less<>> children_;
+  Container* issuer_ = nullptr;
+
+protected:
+  Container* get_issuer() const { return issuer_; }
 
 public:
-  std::map<std::string, Type*> children_;
-  Container* issuer_ = nullptr;
-  std::stringstream stream_;
+  static xbt::signal<void(Type const&, PajeEventType event_type)> on_creation;
 
-  Type(std::string name, std::string alias, std::string color, Type* father);
-  virtual ~Type();
+  Type(PajeEventType event_type, const std::string& name, const std::string& alias, const std::string& color,
+       Type* father);
+  virtual ~Type() = default;
 
-  std::string get_name() { return name_; }
-  const char* get_cname() { return name_.c_str(); }
-  long long int get_id() { return id_; }
-  bool is_colored() { return not color_.empty(); }
+  long long int get_id() const { return id_; }
+  const std::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
+  const std::string& get_color() const { return color_; }
+  Type* get_father() const { return father_; }
+  const std::map<std::string, std::unique_ptr<Type>, std::less<>>& get_children() const { return children_; }
+  bool is_colored() const { return not color_.empty(); }
 
   Type* by_name(const std::string& name);
-  LinkType* by_name_or_create(const std::string& name, Type* source, Type* dest);
-  VariableType* by_name_or_create(const std::string& name, std::string color);
+  LinkType* by_name_or_create(const std::string& name, const Type* source, const Type* dest);
+  VariableType* by_name_or_create(const std::string& name, const std::string& color);
 
   template <class T> T* by_name_or_create(const std::string& name)
   {
     auto cont = children_.find(name);
-    return cont == children_.end() ? new T(name, this) : static_cast<T*>(cont->second);
+    return cont == children_.end() ? new T(name, this) : static_cast<T*>(cont->second.get());
   }
 
-  void set_calling_container(Container* container) { issuer_ = container; }
-
-  void log_definition(e_event_type event_type);
-  void log_definition(Type* source, Type* dest);
+  Type* set_calling_container(Container* container)
+  {
+    issuer_ = container;
+    return this;
+  }
 };
 
 class ContainerType : public Type {
 public:
-  explicit ContainerType(const std::string& name) : Type(name, name, "", nullptr){};
-  ContainerType(const std::string& name, Type* father);
+  explicit ContainerType(const std::string& name) : Type(PajeEventType::DefineContainerType, name, name, "", nullptr){};
+  ContainerType(const std::string& name, Type* father)
+      : Type(PajeEventType::DefineContainerType, name, name, "", father){};
 };
 
 class VariableType : public Type {
   std::vector<VariableEvent*> events_;
 public:
-  VariableType(const std::string& name, std::string color, Type* father);
-  ~VariableType();
+  VariableType(const std::string& name, const std::string& color, Type* father)
+      : Type(PajeEventType::DefineVariableType, name, name, color, father)
+  {
+  }
   void instr_event(double now, double delta, const char* resource, double value);
   void set_event(double timestamp, double value);
   void add_event(double timestamp, double value);
@@ -70,39 +83,44 @@ public:
 
 class ValueType : public Type {
 public:
-  std::map<std::string, EntityValue*> values_;
-  ValueType(std::string name, std::string alias, Type* father) : Type(std::move(name), std::move(alias), "", father){};
-  ValueType(const std::string& name, Type* father) : Type(name, name, "", father){};
-  virtual ~ValueType();
-  void add_entity_value(const std::string& name, std::string color);
+  std::map<std::string, EntityValue, std::less<>> values_;
+  ValueType(PajeEventType event_type, const std::string& name, const std::string& alias, Type* father)
+      : Type(event_type, name, alias, "", father){};
+  ValueType(PajeEventType event_type, const std::string& name, Type* father)
+      : Type(event_type, name, name, "", father){};
+  void add_entity_value(const std::string& name, const std::string& color);
   void add_entity_value(const std::string& name);
   EntityValue* get_entity_value(const std::string& name);
 };
 
 class LinkType : public ValueType {
 public:
-  LinkType(std::string name, std::string alias, Type* father);
-  void start_event(Container* startContainer, std::string value, std::string key);
-  void start_event(Container* startContainer, std::string value, std::string key, int size);
-  void end_event(Container* endContainer, std::string value, std::string key);
+  static xbt::signal<void(LinkType const&, Type const&, Type const&)> on_creation;
+  LinkType(const std::string& name, const Type* source, const Type* dest, const std::string& alias, Type* father)
+      : ValueType(PajeEventType::DefineLinkType, name, alias, father)
+  {
+    on_creation(*this, *source, *dest);
+  }
+  void start_event(Container* startContainer, const std::string& value, const std::string& key,
+                   size_t size = static_cast<size_t>(-1));
+  void end_event(Container* endContainer, const std::string& value, const std::string& key);
 };
 
 class EventType : public ValueType {
 public:
-  EventType(std::string name, Type* father);
+  EventType(const std::string& name, Type* father) : ValueType(PajeEventType::DefineEventType, name, father) {}
 };
 
 class StateType : public ValueType {
   std::vector<StateEvent*> events_;
 public:
-  StateType(std::string name, Type* father);
-  ~StateType();
+  StateType(const std::string& name, Type* father) : ValueType(PajeEventType::DefineStateType, name, father) {}
   void set_event(const std::string& value_name);
   void push_event(const std::string& value_name);
   void push_event(const std::string& value_name, TIData* extra);
   void pop_event();
   void pop_event(TIData* extra);
 };
-}
-}
+} // namespace instr
+} // namespace simgrid
 #endif