X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af45246075b3fc6bc43782309f9320974d5e222d..27fe833c49802fa5fbb1e44dc7b99d119fe3aa4b:/src/instr/instr_paje_containers.hpp

diff --git a/src/instr/instr_paje_containers.hpp b/src/instr/instr_paje_containers.hpp
index 688abeb2fa..e4c33e6700 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-2019. 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,43 +7,53 @@
 #define INSTR_PAJE_CONTAINERS_HPP
 
 #include "src/instr/instr_private.hpp"
+#include <string>
 
 namespace simgrid {
 namespace instr {
 class Type;
+class LinkType;
+class StateType;
+class VariableType;
 
 class Container {
   long long int id_;
   std::string name_; /* Unique name of this container */
 public:
-  Container(std::string name, std::string type_name, Container* father);
+  Container(const std::string& name, const std::string& type_name, Container* father);
+  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();
-
-  static Container* getRootContainer();
+  kernel::routing::NetPoint* netpoint_ = nullptr;
+
+  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() { return name_.c_str(); }
+  long long int get_id() { return id_; }
+  void remove_from_parent();
+  void log_creation();
+  void log_destruction();
+
+  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);
+  static Container* get_root();
 };
 
 class NetZoneContainer : public Container {
 public:
-  NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father);
+  NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father);
 };
 
 class RouterContainer : public Container {
 public:
-  RouterContainer(std::string name, Container* father);
+  RouterContainer(const std::string& name, Container* father);
 };
 
 class HostContainer : public Container {