X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..HEAD:/src/instr/instr_paje_containers.hpp

diff --git a/src/instr/instr_paje_containers.hpp b/src/instr/instr_paje_containers.hpp
index 828024a97c..957d4981ef 100644
--- a/src/instr/instr_paje_containers.hpp
+++ b/src/instr/instr_paje_containers.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. 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. */
@@ -9,55 +9,70 @@
 #include "src/instr/instr_private.hpp"
 #include <string>
 
-namespace simgrid {
-namespace instr {
+namespace simgrid::instr {
 class Type;
 class LinkType;
 class StateType;
 class VariableType;
 
 class Container {
+  friend class NetZoneContainer;
+  static Container* root_container_;
+  static std::map<std::string, Container*, std::less<>> all_containers_;
+
   long long int id_;
   std::string name_; /* Unique name of this container */
+  Type* type_;       /* Type of this container */
+  Container* parent_;
+  std::map<std::string, Container*, std::less<>> children_;
+
+protected:
+  static void set_root(Container* root) { root_container_ = root; }
+
+private:
+  static xbt::signal<void(Container const&)> on_creation;
+  static xbt::signal<void(Container const&)> on_destruction;
+
 public:
-  Container(std::string name, std::string type_name, Container* father);
+  static void on_creation_cb(const std::function<void(Container const&)>& cb) { on_creation.connect(cb); }
+  static void on_destruction_cb(const std::function<void(Container const&)>& cb) { on_destruction.connect(cb); }
+
+  explicit Container(const std::string& name, const std::string& type_name, Container* parent);
+  Container(const Container&) = delete;
+  Container& operator=(const Container&) = delete;
   virtual ~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();
-
-  StateType* getState(std::string name);
-  LinkType* getLink(std::string name);
-  VariableType* getVariable(std::string name);
-  void createChild(std::string name, std::string type_name);
-  static Container* getRoot();
+
+  static Container* by_name_or_null(const std::string& name);
+  static Container* by_name(const std::string& name);
+  const std::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
+  long long int get_id() const { return id_; }
+  void remove_from_parent();
+
+  Container* get_parent() const { return parent_; }
+  Type* get_type() const { return type_; }
+  StateType* get_state(const std::string& name);
+  LinkType* get_link(const std::string& name);
+  VariableType* get_variable(const std::string& name);
+  void create_child(const std::string& name, const std::string& type_name);
+  Container* get_child_by_name(const std::string& name) const { return children_.at(name); }
+  static Container* get_root() { return root_container_; }
 };
 
 class NetZoneContainer : public Container {
 public:
-  NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father);
+  NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* parent);
 };
 
 class RouterContainer : public Container {
 public:
-  RouterContainer(std::string name, Container* father);
+  RouterContainer(const std::string& name, Container* parent);
 };
 
 class HostContainer : public Container {
 public:
-  HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father);
+  HostContainer(s4u::Host const& host, NetZoneContainer* parent);
 };
-}
-}
+} // namespace simgrid::instr
 #endif