A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix Java and MC examples
[simgrid.git]
/
teshsuite
/
simdag
/
flatifier
/
flatifier.cpp
diff --git
a/teshsuite/simdag/flatifier/flatifier.cpp
b/teshsuite/simdag/flatifier/flatifier.cpp
index
b7bf33b
..
bcbe27b
100644
(file)
--- a/
teshsuite/simdag/flatifier/flatifier.cpp
+++ b/
teshsuite/simdag/flatifier/flatifier.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-201
9
. 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. */
/* 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. */
@@
-47,7
+47,7
@@
static void create_environment(xbt_os_timer_t parse_time, const char *platformFi
static void dump_hosts()
{
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,
unsigned int totalHosts = sg_host_count();
sg_host_t* hosts = sg_host_list();
std::sort(hosts, hosts + totalHosts,
@@
-55,15
+55,19
@@
static void dump_hosts()
for (unsigned int i = 0; i < totalHosts; i++) {
std::printf(" <host id=\"%s\" speed=\"%.0f\"", hosts[i]->get_cname(), sg_host_speed(hosts[i]));
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]->get
P
roperties();
- if (hosts[i]->get
CoreC
ount() > 1) {
- std::printf(" core=\"%d\"", hosts[i]->get
CoreC
ount());
+ props = hosts[i]->get
_p
roperties();
+ if (hosts[i]->get
_core_c
ount() > 1) {
+ std::printf(" core=\"%d\"", hosts[i]->get
_core_c
ount());
}
}
- 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");
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 (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");
std::printf(" </host>\n");
} else {
std::printf("/>\n");
@@
-182,7
+186,7
@@
static void dump_platform()
int version = 4;
std::printf("<?xml version='1.0'?>\n");
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 \"http
s://simgrid.org
/simgrid.dtd\">\n");
std::printf("<platform version=\"%d\">\n", version);
std::printf("<AS id=\"AS0\" routing=\"Full\">\n");
std::printf("<platform version=\"%d\">\n", version);
std::printf("<AS id=\"AS0\" routing=\"Full\">\n");