-/* 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. */
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(std::string name): name(name)
+Container::Container(const std::string& name) : name(name)
{
container_name2container.insert({this->name, this});
}
-Container::~Container()
-{
- if (not this->children.empty())
- 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;
-
- //FIXME do we need to sort?: xbt_dynar_sort_strings(host_names);
+ children_.clear();
+ last_id_ = 0;
for (auto const& host : hosts) {
const char *host_name = sg_host_get_name(host);
}
}
-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
this->add_resources(table);
} else {
for (auto const& nz : from_as->get_children()) {
- jed_container_t child_container = new simgrid::jedule::Container(std::string(nz->get_cname()));
+ jed_container_t child_container = new simgrid::jedule::Container(nz->get_name());
this->add_child(child_container);
child_container->create_hierarchy(nz);
}
}
}
-std::vector<int> Container::get_hierarchy()
+int Container::get_child_position(const Container* child) const
{
- if(this->parent != nullptr ) {
-
- if (not this->parent->children.empty()) {
- // we are in the last level
- return this->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++;
- }
+ 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);
+}
- xbt_assert( child_nb > - 1);
- std::vector<int> heir_list = this->parent->get_hierarchy();
- heir_list.insert(heir_list.begin(), child_nb);
- return heir_list;
- }
- } else {
+std::vector<int> Container::get_hierarchy()
+{
+ if (parent_ == nullptr) {
int top_level = 0;
std::vector<int> heir_list = {top_level};
return heir_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;
+ } else {
+ // we are in the last level
+ return parent_->get_hierarchy();
}
}
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 {
fprintf(jed_file, " </res>\n");
}
-}
-}
+} // namespace jedule
+} // namespace simgrid
-static void add_subsets_to(std::vector<jed_subset_t> *subset_list, std::vector<const char*> hostgroup, jed_container_t parent)
+static void add_subsets_to(std::vector<simgrid::jedule::Subset>& subset_list, std::vector<const char*> hostgroup,
+ jed_container_t parent)
{
// get ids for each host
// sort ids
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);
+ 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();
int pos = start;
for(unsigned int i=0; i<nb_ids; i++) {
if( id_list[i] - id_list[pos] > 1 ) {
- subset_list->push_back(new simgrid::jedule::Subset(id_list[start], id_list[pos], parent));
+ subset_list.emplace_back(id_list[start], id_list[pos], parent);
start = i;
if( i == nb_ids-1 ) {
- subset_list->push_back(new simgrid::jedule::Subset(id_list[i], id_list[i], parent));
+ subset_list.emplace_back(id_list[i], id_list[i], parent);
}
} else {
if( i == nb_ids-1 ) {
- subset_list->push_back(new simgrid::jedule::Subset(id_list[start], id_list[i], parent));
+ subset_list.emplace_back(id_list[start], id_list[i], parent);
}
}
pos = i;
}
}
-
}
-void get_resource_selection_by_hosts(std::vector<jed_subset_t> *subset_list, std::vector<sg_host_t> *host_list)
+void get_resource_selection_by_hosts(std::vector<simgrid::jedule::Subset>& subset_list,
+ const std::vector<sg_host_t>& host_list)
{
- xbt_assert( host_list != nullptr );
// for each host name
// find parent container
// group by parent container
std::unordered_map<const char*, std::vector<const char*>> parent2hostgroup;
- for (auto const& 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);
+ 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);
}
