-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-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. */
static void create_environment(xbt_os_timer_t parse_time, const char *platformFile)
{
- try {
- xbt_os_cputimer_start(parse_time);
- SD_create_environment(platformFile);
- xbt_os_cputimer_stop(parse_time);
- }
- catch (std::exception& e) {
- xbt_die("Error while loading %s: %s", platformFile, e.what());
- }
+ xbt_os_cputimer_start(parse_time);
+ SD_create_environment(platformFile);
+ xbt_os_cputimer_stop(parse_time);
}
static void dump_hosts()
{
- std::map<std::string, std::string>* props = nullptr;
+ std::unordered_map<std::string, std::string>* props = nullptr;
unsigned int totalHosts = sg_host_count();
sg_host_t* hosts = sg_host_list();
std::sort(hosts, hosts + totalHosts,
for (unsigned int i = 0; i < totalHosts; i++) {
std::printf(" <host id=\"%s\" speed=\"%.0f\"", hosts[i]->get_cname(), sg_host_speed(hosts[i]));
- props = hosts[i]->getProperties();
- if (hosts[i]->getCoreCount() > 1) {
- std::printf(" core=\"%d\"", hosts[i]->getCoreCount());
+ props = hosts[i]->get_properties();
+ if (hosts[i]->get_core_count() > 1) {
+ std::printf(" core=\"%d\"", hosts[i]->get_core_count());
}
- if (props && not props->empty()) {
+ // Sort the properties before displaying them, so that the tests are perfectly reproducible
+ std::vector<std::string> keys;
+ for (auto const& kv : *props)
+ keys.push_back(kv.first);
+ if (not keys.empty()) {
std::printf(">\n");
- for (auto const& kv : *props) {
- std::printf(" <prop id=\"%s\" value=\"%s\"/>\n", kv.first.c_str(), kv.second.c_str());
- }
+ std::sort(keys.begin(), keys.end());
+ for (const std::string& key : keys)
+ std::printf(" <prop id=\"%s\" value=\"%s\"/>\n", key.c_str(), props->at(key).c_str());
std::printf(" </host>\n");
} else {
std::printf("/>\n");
simgrid::s4u::Link* link = links[i];
std::printf(" <link id=\"");
- std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->bandwidth(), link->latency());
+ std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->get_bandwidth(), link->get_latency());
if (sg_link_is_shared(link)) {
std::printf("/>\n");
} else {
int version = 4;
std::printf("<?xml version='1.0'?>\n");
- std::printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n");
+ std::printf("<!DOCTYPE platform SYSTEM \"https://simgrid.org/simgrid.dtd\">\n");
std::printf("<platform version=\"%d\">\n", version);
std::printf("<AS id=\"AS0\" routing=\"Full\">\n");