Use (const) references with range-based for loops.

[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 babb894..877905d 100644 (file)
--- a/src/instr/jedule/jedule_platform.cpp
+++ b/src/instr/jedule/jedule_platform.cpp
@@ -27,7 +27,7 @@ Container::Container(std::string name): name(name)
 Container::~Container()
 {
   if (not this->children.empty())
 Container::~Container()
 {
   if (not this->children.empty())

-    for (auto child: this->children)
+    for (auto const& child : this->children)

       delete child;
 }
 
       delete child;
 }
 


@@ -46,7 +46,7 @@ void Container::addResources(std::vector<sg_host_t> hosts)
 
   //FIXME do we need to sort?: xbt_dynar_sort_strings(host_names);
 
 
   //FIXME do we need to sort?: xbt_dynar_sort_strings(host_names);
 

-  for (auto host : hosts) {
+  for (auto const& host : hosts) {

     const char *host_name = sg_host_get_name(host);
     this->name2id.insert({host_name, this->last_id});
     (this->last_id)++;
     const char *host_name = sg_host_get_name(host);
     this->name2id.insert({host_name, this->last_id});
     (this->last_id)++;


@@ -65,7 +65,7 @@ void Container::createHierarchy(sg_netzone_t from_as)
     from_as->getHosts(&table);
     this->addResources(table);
   } else {
     from_as->getHosts(&table);
     this->addResources(table);
   } else {

-    for (auto nz : *from_as->getChildren()) {
+    for (auto const& nz : *from_as->getChildren()) {

       jed_container_t child_container = new simgrid::jedule::Container(std::string(nz->getCname()));
       this->addChild(child_container);
       child_container->createHierarchy(nz);
       jed_container_t child_container = new simgrid::jedule::Container(std::string(nz->getCname()));
       this->addChild(child_container);
       child_container->createHierarchy(nz);


@@ -84,7 +84,7 @@ std::vector<int> Container::getHierarchy()
       unsigned int i =0;
       int child_nb = -1;
 
       unsigned int i =0;
       int child_nb = -1;
 

-      for (auto child : this->parent->children) {
+      for (auto const& child : this->parent->children) {

         if( child == this) {
           child_nb = i;
           break;
         if( child == this) {
           child_nb = i;
           break;


@@ -112,7 +112,7 @@ std::string Container::getHierarchyAsString()
 
   unsigned int length = heir_list.size();
   unsigned int i = 0;
 
   unsigned int length = heir_list.size();
   unsigned int i = 0;

-  for (auto id : heir_list) {
+  for (auto const& id : heir_list) {

     output += std::to_string(id);
     if( i != length-1 ) {
       output += ".";
     output += std::to_string(id);
     if( i != length-1 ) {
       output += ".";


@@ -131,7 +131,7 @@ void Container::printResources(FILE * jed_file)
   std::string resid = this->getHierarchyAsString();
 
   fprintf(jed_file, "      <rset id=\"%s\" nb=\"%u\" names=\"", resid.c_str(), res_nb);
   std::string resid = this->getHierarchyAsString();
 
   fprintf(jed_file, "      <rset id=\"%s\" nb=\"%u\" names=\"", resid.c_str(), res_nb);

-  for (auto res: this->resource_list) {
+  for (auto const& res : this->resource_list) {

     const char * res_name = sg_host_get_name(res);
     fprintf(jed_file, "%s", res_name);
     if( i != res_nb-1 ) {
     const char * res_name = sg_host_get_name(res);
     fprintf(jed_file, "%s", res_name);
     if( i != res_nb-1 ) {


@@ -146,7 +146,7 @@ void Container::print(FILE* jed_file)
 {
   fprintf(jed_file, "    <res name=\"%s\">\n", this->name.c_str());
   if (not this->children.empty()) {
 {
   fprintf(jed_file, "    <res name=\"%s\">\n", this->name.c_str());
   if (not this->children.empty()) {

-    for (auto child: this->children) {
+    for (auto const& child : this->children) {

       child->print(jed_file);
     }
   } else {
       child->print(jed_file);
     }
   } else {


@@ -169,7 +169,7 @@ static void add_subsets_to(std::vector<jed_subset_t> *subset_list, std::vector<c
 
   std::vector<unsigned int> id_list;
 
 
   std::vector<unsigned int> id_list;
 

-  for (auto host_name : hostgroup) {
+  for (auto const& host_name : hostgroup) {

     xbt_assert( host_name != nullptr );
     jed_container_t parent = host2_simgrid_parent_container.at(host_name);
     unsigned int id = parent->name2id.at(host_name);
     xbt_assert( host_name != nullptr );
     jed_container_t parent = host2_simgrid_parent_container.at(host_name);
     unsigned int id = parent->name2id.at(host_name);


@@ -207,7 +207,7 @@ void get_resource_selection_by_hosts(std::vector<jed_subset_t> *subset_list, std
   //  find parent container
   //  group by parent container
   std::unordered_map<const char*, std::vector<const char*>> parent2hostgroup;
   //  find parent container
   //  group by parent container
   std::unordered_map<const char*, std::vector<const char*>> parent2hostgroup;

-  for (auto host: *host_list) {
+  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);
     xbt_assert( parent != nullptr );
     const char *host_name = sg_host_get_name(host);
     jed_container_t parent = host2_simgrid_parent_container.at(host_name);
     xbt_assert( parent != nullptr );


@@ -219,7 +219,7 @@ void get_resource_selection_by_hosts(std::vector<jed_subset_t> *subset_list, std
       host_group->second.push_back(host_name);
   }
 
       host_group->second.push_back(host_name);
   }
 

-  for (auto elm: parent2hostgroup) {
+  for (auto const& elm : parent2hostgroup) {

     jed_container_t parent = container_name2container.at(elm.first);
     add_subsets_to(subset_list, elm.second, parent);
   }
     jed_container_t parent = container_name2container.at(elm.first);
     add_subsets_to(subset_list, elm.second, parent);
   }