-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2019. 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. */
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::addChild(jed_container_t child)
+void Container::add_child(jed_container_t child)
{
xbt_assert(child != nullptr);
- this->children.push_back(child);
+ this->children.emplace_back(child);
child->parent = this;
}
-void Container::addResources(std::vector<sg_host_t> hosts)
+void Container::add_resources(std::vector<sg_host_t> hosts)
{
- this->is_lowest = 1;
+ this->is_lowest_ = 1;
this->children.clear();
- this->last_id = 0;
-
- //FIXME do we need to sort?: xbt_dynar_sort_strings(host_names);
+ this->last_id_ = 0;
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)++;
+ this->name2id.insert({host_name, this->last_id_});
+ (this->last_id_)++;
host2_simgrid_parent_container.insert({host_name, this});
this->resource_list.push_back(host);
}
}
-void Container::createHierarchy(sg_netzone_t from_as)
+void Container::create_hierarchy(sg_netzone_t from_as)
{
- if (from_as->getChildren()->empty()) {
+ if (from_as->get_children().empty()) {
// I am no AS
// add hosts to jedule platform
std::vector<sg_host_t> table = from_as->get_all_hosts();
- this->addResources(table);
+ this->add_resources(table);
} else {
- for (auto const& nz : *from_as->getChildren()) {
- jed_container_t child_container = new simgrid::jedule::Container(std::string(nz->get_cname()));
- this->addChild(child_container);
- child_container->createHierarchy(nz);
+ for (auto const& nz : from_as->get_children()) {
+ 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::getHierarchy()
+std::vector<int> Container::get_hierarchy()
{
if(this->parent != nullptr ) {
if (not this->parent->children.empty()) {
// we are in the last level
- return this->parent->getHierarchy();
+ return this->parent->get_hierarchy();
} else {
unsigned int i =0;
int child_nb = -1;
for (auto const& child : this->parent->children) {
- if( child == this) {
+ if (child.get() == this) {
child_nb = i;
break;
}
}
xbt_assert( child_nb > - 1);
- std::vector<int> heir_list = this->parent->getHierarchy();
+ std::vector<int> heir_list = this->parent->get_hierarchy();
heir_list.insert(heir_list.begin(), child_nb);
return heir_list;
}
}
}
-std::string Container::getHierarchyAsString()
+std::string Container::get_hierarchy_as_string()
{
std::string output("");
- std::vector<int> heir_list = this->getHierarchy();
+ std::vector<int> heir_list = this->get_hierarchy();
unsigned int length = heir_list.size();
unsigned int i = 0;
return output;
}
-void Container::printResources(FILE * jed_file)
+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->getHierarchyAsString();
+ std::string resid = this->get_hierarchy_as_string();
fprintf(jed_file, " <rset id=\"%s\" nb=\"%u\" names=\"", resid.c_str(), res_nb);
for (auto const& res : this->resource_list) {
child->print(jed_file);
}
} else {
- this->printResources(jed_file);
+ this->print_resources(jed_file);
}
fprintf(jed_file, " </res>\n");
}
}
}
-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);
+ jed_container_t parent_cont = host2_simgrid_parent_container.at(host_name);
+ unsigned int id = parent_cont->name2id.at(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);
xbt_assert( parent != nullptr );
