[sonar] don't mix public/private issues in jedule

[simgrid.git] / src / instr / jedule / jedule_platform.cpp

diff --git a/src/instr/jedule/jedule_platform.cpp b/src/instr/jedule/jedule_platform.cpp
index 13d1ef6..53e657a 100644 (file)
--- a/src/instr/jedule/jedule_platform.cpp
+++ b/src/instr/jedule/jedule_platform.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2020. 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. */
@@ -19,9 +19,8 @@ std::unordered_map<std::string, jed_container_t> container_name2container;
 namespace simgrid {
 namespace jedule {
 Subset::Subset(int start_idx, int end_idx, Container* parent)
-: start_idx(start_idx), parent(parent)
+    : start_idx(start_idx), nres(end_idx - start_idx + 1), parent(parent)
 {
-  nres=end_idx-start_idx+1;
 }
 
 Container::Container(const std::string& name) : name(name)
@@ -29,24 +28,17 @@ Container::Container(const std::string& name) : name(name)
   container_name2container.insert({this->name, this});
 }
 
-Container::~Container()
-{
-  for (auto const& child : this->children)
-    delete child;
-}
-
 void Container::add_child(jed_container_t child)
 {
   xbt_assert(child != nullptr);
-  this->children.push_back(child);
-  child->parent = this;
+  children_.emplace_back(child);
+  child->set_parent(this);
 }
 
 void Container::add_resources(std::vector<sg_host_t> hosts)
 {
-  this->is_lowest_ = 1;
-  this->children.clear();
-  this->last_id_ = 0;
+  children_.clear();
+  last_id_ = 0;
 
   for (auto const& host : hosts) {
     const char *host_name = sg_host_get_name(host);
@@ -57,9 +49,8 @@ void Container::add_resources(std::vector<sg_host_t> hosts)
   }
 }
 
-void Container::create_hierarchy(sg_netzone_t from_as)
+void Container::create_hierarchy(const_sg_netzone_t from_as)
 {
-
   if (from_as->get_children().empty()) {
     // I am no AS
     // add hosts to jedule platform
@@ -74,27 +65,32 @@ void Container::create_hierarchy(sg_netzone_t from_as)
   }
 }
 
-std::vector<int> Container::get_hierarchy()
+int Container::get_child_position(Container* child)
 {
-  if(this->parent != nullptr ) {
+  unsigned int i = 0;
+  int child_nb   = -1;
 
-    if (not this->parent->children.empty()) {
+  for (auto const& c : children_) {
+    if (c.get() == child) {
+      child_nb = i;
+      break;
+    }
+    i++;
+  }
+  return child_nb;
+}
+
+std::vector<int> Container::get_hierarchy()
+{
+  if (parent_ != nullptr) {
+    if (not parent_->has_children()) {
       // we are in the last level
-      return this->parent->get_hierarchy();
+      return parent_->get_hierarchy();
     } else {
-      unsigned int i =0;
-      int child_nb = -1;
-
-      for (auto const& child : this->parent->children) {
-        if( child == this) {
-          child_nb = i;
-          break;
-        }
-        i++;
-      }
+      int child_nb = parent_->get_child_position(this);
 
       xbt_assert( child_nb > - 1);
-      std::vector<int> heir_list = this->parent->get_hierarchy();
+      std::vector<int> heir_list = parent_->get_hierarchy();
       heir_list.insert(heir_list.begin(), child_nb);
       return heir_list;
     }
@@ -146,8 +142,8 @@ void Container::print_resources(FILE* jed_file)
 void Container::print(FILE* jed_file)
 {
   fprintf(jed_file, "    <res name=\"%s\">\n", this->name.c_str());
-  if (not this->children.empty()) {
-    for (auto const& child : this->children) {
+  if (not children_.empty()) {
+    for (auto const& child : children_) {
       child->print(jed_file);
     }
   } else {
@@ -156,8 +152,8 @@ void Container::print(FILE* jed_file)
   fprintf(jed_file, "    </res>\n");
 }
 
-}
-}
+} // namespace jedule
+} // namespace simgrid
 
 static void add_subsets_to(std::vector<simgrid::jedule::Subset>& subset_list, std::vector<const char*> hostgroup,
                            jed_container_t parent)
@@ -174,7 +170,7 @@ static void add_subsets_to(std::vector<simgrid::jedule::Subset>& subset_list, st
   for (auto const& host_name : hostgroup) {
     xbt_assert( host_name != nullptr );
     jed_container_t parent_cont = host2_simgrid_parent_container.at(host_name);
-    unsigned int id             = parent_cont->name2id.at(host_name);
+    unsigned int id             = parent_cont->get_id_by_name(host_name);
     id_list.push_back(id);
   }
   unsigned int nb_ids = id_list.size();
@@ -199,7 +195,6 @@ static void add_subsets_to(std::vector<simgrid::jedule::Subset>& subset_list, st
       pos = i;
     }
   }
-
 }
 
 void get_resource_selection_by_hosts(std::vector<simgrid::jedule::Subset>& subset_list,
@@ -211,12 +206,12 @@ void get_resource_selection_by_hosts(std::vector<simgrid::jedule::Subset>& subse
   std::unordered_map<const char*, std::vector<const char*>> parent2hostgroup;
   for (auto const& host : host_list) {
     const char *host_name = sg_host_get_name(host);
-    jed_container_t parent = host2_simgrid_parent_container.at(host_name);
+    const simgrid::jedule::Container* parent = host2_simgrid_parent_container.at(host_name);
     xbt_assert( parent != nullptr );
 
-    auto host_group = parent2hostgroup.find(parent->name.c_str());
+    auto host_group = parent2hostgroup.find(parent->get_cname());
     if (host_group == parent2hostgroup.end())
-      parent2hostgroup.insert({parent->name.c_str(), std::vector<const char*>(1,host_name)});
+      parent2hostgroup.insert({parent->get_cname(), std::vector<const char*>(1, host_name)});
     else
       host_group->second.push_back(host_name);
   }