-/* Copyright (c) 2010-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2018. 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. */
#include "simgrid/jedule/jedule.hpp"
-#include "simgrid/jedule/jedule_platform.hpp"
+#include "simgrid/host.h"
#include "simgrid/s4u/NetZone.hpp"
#include "xbt/asserts.h"
-#include "xbt/dynar.h"
#include <algorithm>
-#if HAVE_JEDULE
+#if SIMGRID_HAVE_JEDULE
+
+namespace {
+std::unordered_map<const char*, jed_container_t> host2_simgrid_parent_container;
+std::unordered_map<std::string, jed_container_t> container_name2container;
+}
namespace simgrid {
namespace jedule {
Container::~Container()
{
- if(!this->children.empty())
- for (auto child: this->children)
+ if (not this->children.empty())
+ for (auto const& child : this->children)
delete child;
}
void Container::addChild(jed_container_t child)
{
- xbt_assert(this != nullptr);
xbt_assert(child != nullptr);
this->children.push_back(child);
child->parent = this;
//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)++;
}
}
-void Container::createHierarchy(AS_t from_as)
+void Container::createHierarchy(sg_netzone_t from_as)
{
- xbt_dict_cursor_t cursor = nullptr;
- char *key;
- AS_t elem;
- xbt_dict_t routing_sons = from_as->children();
- if (xbt_dict_is_empty(routing_sons)) {
+ if (from_as->getChildren()->empty()) {
// I am no AS
// add hosts to jedule platform
- xbt_dynar_t table = from_as->hosts();
- unsigned int dynar_cursor;
- sg_host_t host;
-
- std::vector<sg_host_t> hosts;
-
- xbt_dynar_foreach(table, dynar_cursor, host) {
- hosts.push_back(host);
- }
- this->addResources(hosts);
- xbt_dynar_free(&table);
+ std::vector<sg_host_t> table;
+ from_as->getHosts(&table);
+ this->addResources(table);
} else {
- xbt_dict_foreach(routing_sons, cursor, key, elem) {
- jed_container_t child_container = new simgrid::jedule::Container(std::string(elem->name()));
+ 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(elem);
+ child_container->createHierarchy(nz);
}
}
}
std::vector<int> Container::getHierarchy()
{
- xbt_assert( this!= nullptr );
-
if(this->parent != nullptr ) {
- if(!this->parent->children.empty()) {
+ if (not this->parent->children.empty()) {
// we are in the last level
return this->parent->getHierarchy();
} else {
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;
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 += ".";
void Container::printResources(FILE * jed_file)
{
unsigned int i=0;
- xbt_assert(!this->resource_list.empty());
+ xbt_assert(not this->resource_list.empty());
unsigned int res_nb = this->resource_list.size();
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 ) {
void Container::print(FILE* jed_file)
{
- xbt_assert( this != nullptr );
fprintf(jed_file, " <res name=\"%s\">\n", this->name.c_str());
- if( !this->children.empty()){
- for (auto child: this->children) {
+ if (not this->children.empty()) {
+ for (auto const& child : this->children) {
child->print(jed_file);
}
} else {
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);
// 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 );
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);
}
