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
Use plain pointers instead of references to pointer.
[simgrid.git]
/
src
/
kernel
/
routing
/
DragonflyZone.cpp
diff --git
a/src/kernel/routing/DragonflyZone.cpp
b/src/kernel/routing/DragonflyZone.cpp
index de5aa5806a359a8ee08a138001fcb183b21874de..7afec19616c44e3e8423fb6c76f0bebc865664ed 100644
(file)
--- a/
src/kernel/routing/DragonflyZone.cpp
+++ b/
src/kernel/routing/DragonflyZone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-202
3
. 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. */
@@
-12,11
+12,10
@@
#include <numeric>
#include <string>
#include <numeric>
#include <string>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_dragonfly, ker_
routing
, "Kernel Dragonfly Routing");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_dragonfly, ker_
platform
, "Kernel Dragonfly Routing");
namespace simgrid {
namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace kernel::routing {
DragonflyZone::DragonflyZone(const std::string& name) : ClusterBase(name) {}
DragonflyZone::DragonflyZone(const std::string& name) : ClusterBase(name) {}
@@
-74,14
+73,14
@@
s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top
try {
n_groups = std::stoi(tmp[0]);
} catch (const std::invalid_argument&) {
try {
n_groups = std::stoi(tmp[0]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid number of groups:")
+ tmp[0]);
+ throw std::invalid_argument(
"Invalid number of groups:"
+ tmp[0]);
}
unsigned int n_blue;
try {
n_blue = std::stoi(tmp[1]);
} catch (const std::invalid_argument&) {
}
unsigned int n_blue;
try {
n_blue = std::stoi(tmp[1]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid number of links for the blue level:")
+ tmp[1]);
+ throw std::invalid_argument(
"Invalid number of links for the blue level:"
+ tmp[1]);
}
// Black network : number of chassis/group, number of links between each router on the black network
}
// Black network : number of chassis/group, number of links between each router on the black network
@@
-93,14
+92,14
@@
s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top
try {
n_chassis = std::stoi(tmp[0]);
} catch (const std::invalid_argument&) {
try {
n_chassis = std::stoi(tmp[0]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid number of chassis:")
+ tmp[0]);
+ throw std::invalid_argument(
"Invalid number of chassis:"
+ tmp[0]);
}
unsigned int n_black;
try {
n_black = std::stoi(tmp[1]);
} catch (const std::invalid_argument&) {
}
unsigned int n_black;
try {
n_black = std::stoi(tmp[1]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid number of links for the black level:")
+ tmp[1]);
+ throw std::invalid_argument(
"Invalid number of links for the black level:"
+ tmp[1]);
}
// Green network : number of blades/chassis, number of links between each router on the green network
}
// Green network : number of blades/chassis, number of links between each router on the green network
@@
-112,14
+111,14
@@
s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top
try {
n_routers = std::stoi(tmp[0]);
} catch (const std::invalid_argument&) {
try {
n_routers = std::stoi(tmp[0]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid number of routers:")
+ tmp[0]);
+ throw std::invalid_argument(
"Invalid number of routers:"
+ tmp[0]);
}
unsigned int n_green;
try {
n_green = std::stoi(tmp[1]);
} catch (const std::invalid_argument&) {
}
unsigned int n_green;
try {
n_green = std::stoi(tmp[1]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid number of links for the green level:")
+ tmp[1]);
+ throw std::invalid_argument(
"Invalid number of links for the green level:"
+ tmp[1]);
}
// The last part of topo_parameters should be the number of nodes per blade
}
// The last part of topo_parameters should be the number of nodes per blade
@@
-127,7
+126,7
@@
s4u::DragonflyParams DragonflyZone::parse_topo_parameters(const std::string& top
try {
n_nodes = std::stoi(parameters[3]);
} catch (const std::invalid_argument&) {
try {
n_nodes = std::stoi(parameters[3]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Last parameter is not the amount of nodes per blade:")
+ parameters[3]);
+ throw std::invalid_argument(
"Last parameter is not the amount of nodes per blade:"
+ parameters[3]);
}
return s4u::DragonflyParams({n_groups, n_blue}, {n_chassis, n_black}, {n_routers, n_green}, n_nodes);
}
}
return s4u::DragonflyParams({n_groups, n_blue}, {n_chassis, n_black}, {n_routers, n_green}, n_nodes);
}
@@
-366,8
+365,7
@@
void DragonflyZone::get_local_route(const NetPoint* src, const NetPoint* dst, Ro
route->gw_src_ = get_gateway(src->id());
route->gw_dst_ = get_gateway(dst->id());
}
route->gw_src_ = get_gateway(src->id());
route->gw_dst_ = get_gateway(dst->id());
}
-} // namespace routing
-} // namespace kernel
+} // namespace kernel::routing
namespace s4u {
DragonflyParams::DragonflyParams(const std::pair<unsigned int, unsigned int>& groups,
namespace s4u {
DragonflyParams::DragonflyParams(const std::pair<unsigned int, unsigned int>& groups,