Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
no need to store a netpoint_ there
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Fri, 27 Mar 2020 23:14:11 +0000 (00:14 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Fri, 27 Mar 2020 23:14:11 +0000 (00:14 +0100)
src/instr/instr_paje_containers.cpp
src/instr/instr_paje_containers.hpp

index c0ef9ad..0680d8c 100644 (file)
@@ -30,8 +30,7 @@ Container* Container::get_root()
 NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father)
     : Container::Container(name, "", father)
 {
-  netpoint_ = s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
-  xbt_assert(netpoint_, "Element '%s' not found", get_cname());
+  xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Element '%s' not found", get_cname());
   if (father_) {
     std::string type_name = std::string("L") + std::to_string(level);
     type_                 = father_->type_->by_name_or_create<ContainerType>(type_name);
@@ -47,18 +46,14 @@ RouterContainer::RouterContainer(const std::string& name, Container* father)
     : Container::Container(name, "ROUTER", father)
 {
   xbt_assert(father, "Only the Root container has no father");
-
-  netpoint_ = s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
-  xbt_assert(netpoint_, "Element '%s' not found", get_cname());
+  xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Element '%s' not found", get_cname());
 }
 
 HostContainer::HostContainer(s4u::Host const& host, NetZoneContainer* father)
     : Container::Container(host.get_name(), "HOST", father)
 {
   xbt_assert(father, "Only the Root container has no father");
-
-  netpoint_ = host.get_netpoint();
-  xbt_assert(netpoint_, "Element '%s' not found", host.get_cname());
+  xbt_assert(host.get_netpoint(), "Element '%s' not found", host.get_cname());
 }
 
 Container::Container(const std::string& name, const std::string& type_name, Container* father)
index 584f0ee..71cfda3 100644 (file)
@@ -32,7 +32,6 @@ public:
   Type* type_; /* Type of this container */
   Container* father_;
   std::map<std::string, Container*> children_;
-  kernel::routing::NetPoint* netpoint_ = nullptr;
 
   static Container* by_name_or_null(const std::string& name);
   static Container* by_name(const std::string& name);