X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..d32cddf4087e9fe3fd8007773f4b247f21c8bef7:/src/instr/jedule/jedule_platform.cpp diff --git a/src/instr/jedule/jedule_platform.cpp b/src/instr/jedule/jedule_platform.cpp index 891b31aef4..668eee3083 100644 --- a/src/instr/jedule/jedule_platform.cpp +++ b/src/instr/jedule/jedule_platform.cpp @@ -19,9 +19,8 @@ std::unordered_map 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) @@ -53,7 +52,6 @@ void Container::add_resources(std::vector hosts) void Container::create_hierarchy(sg_netzone_t from_as) { - if (from_as->get_children().empty()) { // I am no AS // add hosts to jedule platform @@ -71,7 +69,6 @@ void Container::create_hierarchy(sg_netzone_t from_as) std::vector Container::get_hierarchy() { if(this->parent != nullptr ) { - if (not this->parent->children.empty()) { // we are in the last level return this->parent->get_hierarchy(); @@ -150,8 +147,8 @@ void Container::print(FILE* jed_file) fprintf(jed_file, " \n"); } -} -} +} // namespace jedule +} // namespace simgrid static void add_subsets_to(std::vector& subset_list, std::vector hostgroup, jed_container_t parent) @@ -193,7 +190,6 @@ static void add_subsets_to(std::vector& subset_list, st pos = i; } } - } void get_resource_selection_by_hosts(std::vector& subset_list, @@ -205,7 +201,7 @@ void get_resource_selection_by_hosts(std::vector& subse std::unordered_map> 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());