this->add_resources(table);
} else {
for (auto const& nz : from_as->get_children()) {
- jed_container_t child_container = new simgrid::jedule::Container(nz->get_name());
+ auto* child_container = new simgrid::jedule::Container(nz->get_name());
this->add_child(child_container);
child_container->create_hierarchy(nz);
}
{
auto it = std::find_if(begin(children_), end(children_),
[&child](const std::unique_ptr<Container>& c) { return c.get() == child; });
- return it == end(children_) ? -1 : std::distance(begin(children_), it);
+ return it == end(children_) ? -1 : static_cast<int>(std::distance(begin(children_), it));
}
std::vector<int> Container::get_hierarchy()
{
if (parent_ == nullptr) {
int top_level = 0;
- std::vector<int> heir_list = {top_level};
- return heir_list;
+ std::vector<int> hier_list = {top_level};
+ return hier_list;
} else if (parent_->has_children()) {
int child_nb = parent_->get_child_position(this);
xbt_assert(child_nb > -1);
- std::vector<int> heir_list = parent_->get_hierarchy();
- heir_list.insert(heir_list.begin(), child_nb);
- return heir_list;
+ std::vector<int> hier_list = parent_->get_hierarchy();
+ hier_list.insert(hier_list.begin(), child_nb);
+ return hier_list;
} else {
// we are in the last level
return parent_->get_hierarchy();
{
std::string output("");
- std::vector<int> heir_list = this->get_hierarchy();
+ std::vector<int> hier_list = this->get_hierarchy();
- unsigned int length = heir_list.size();
- unsigned int i = 0;
- for (auto const& id : heir_list) {
+ bool sep = false;
+ for (auto const& id : hier_list) {
+ if (sep)
+ output += '.';
+ else
+ sep = true;
output += std::to_string(id);
- if( i != length-1 ) {
- output += ".";
- }
}
return output;
void Container::print_resources(FILE* jed_file)
{
- unsigned int i=0;
xbt_assert(not this->resource_list.empty());
- unsigned int res_nb = this->resource_list.size();
- std::string resid = this->get_hierarchy_as_string();
+ std::string resid = this->get_hierarchy_as_string();
- fprintf(jed_file, " <rset id=\"%s\" nb=\"%u\" names=\"", resid.c_str(), res_nb);
+ fprintf(jed_file, " <rset id=\"%s\" nb=\"%zu\" names=\"", resid.c_str(), this->resource_list.size());
+ bool sep = false;
for (auto const& res : this->resource_list) {
+ if (sep)
+ putc('|', jed_file);
+ else
+ sep = true;
const char * res_name = sg_host_get_name(res);
fprintf(jed_file, "%s", res_name);
- if( i != res_nb-1 ) {
- fprintf(jed_file, "|");
- }
- i++;
}
fprintf(jed_file, "\" />\n");
}
for (auto const& host_name : hostgroup) {
xbt_assert( host_name != nullptr );
- jed_container_t parent_cont = host2_simgrid_parent_container.at(host_name);
+ const simgrid::jedule::Container* parent_cont = host2_simgrid_parent_container.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();
std::sort(id_list.begin(), id_list.end());
- if( nb_ids > 0 ) {
- int start = 0;
- int pos = start;
- for(unsigned int i=0; i<nb_ids; i++) {
- if( id_list[i] - id_list[pos] > 1 ) {
- subset_list.emplace_back(id_list[start], id_list[pos], parent);
- start = i;
-
- if( i == nb_ids-1 ) {
- subset_list.emplace_back(id_list[i], id_list[i], parent);
- }
- } else {
- if( i == nb_ids-1 ) {
- subset_list.emplace_back(id_list[start], id_list[i], parent);
- }
+ size_t nb_ids = id_list.size();
+ size_t start = 0;
+ size_t pos = start;
+ for (size_t i = 0; i < nb_ids; i++) {
+ if (id_list[i] - id_list[pos] > 1) {
+ subset_list.emplace_back(id_list[start], id_list[pos], parent);
+ start = i;
+
+ if (i == nb_ids - 1) {
+ subset_list.emplace_back(id_list[i], id_list[i], parent);
+ }
+ } else {
+ if (i == nb_ids - 1) {
+ subset_list.emplace_back(id_list[start], id_list[i], parent);
}
- pos = i;
}
+ pos = i;
}
}