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
privatize and snake_case some methods in DragonflyZone
[simgrid.git]
/
src
/
kernel
/
routing
/
VivaldiZone.cpp
diff --git
a/src/kernel/routing/VivaldiZone.cpp
b/src/kernel/routing/VivaldiZone.cpp
index
b424a47
..
8bc5201
100644
(file)
--- a/
src/kernel/routing/VivaldiZone.cpp
+++ b/
src/kernel/routing/VivaldiZone.cpp
@@
-51,7
+51,7
@@
static inline double euclidean_dist_comp(int index, std::vector<double>* src, st
return (src_coord - dst_coord) * (src_coord - dst_coord);
}
return (src_coord - dst_coord) * (src_coord - dst_coord);
}
-static std::vector<double>*
getCoordsFromNetpoint
(NetPoint* np)
+static std::vector<double>*
netpoint_get_coords
(NetPoint* np)
{
simgrid::kernel::routing::vivaldi::Coords* coords = np->extension<simgrid::kernel::routing::vivaldi::Coords>();
xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",
{
simgrid::kernel::routing::vivaldi::Coords* coords = np->extension<simgrid::kernel::routing::vivaldi::Coords>();
xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",
@@
-63,7
+63,7
@@
VivaldiZone::VivaldiZone(NetZone* father, std::string name) : ClusterZone(father
{
}
{
}
-void VivaldiZone::set
PeerL
ink(NetPoint* netpoint, double bw_in, double bw_out, std::string coord)
+void VivaldiZone::set
_peer_l
ink(NetPoint* netpoint, double bw_in, double bw_out, std::string coord)
{
xbt_assert(netpoint->get_englobing_zone() == this,
"Cannot add a peer link to a netpoint that is not in this netzone");
{
xbt_assert(netpoint->get_englobing_zone() == this,
"Cannot add a peer link to a netpoint that is not in this netzone");
@@
-84,8
+84,8
@@
void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
if (src->is_netzone()) {
std::string srcName = "router_" + src->get_name();
std::string dstName = "router_" + dst->get_name();
if (src->is_netzone()) {
std::string srcName = "router_" + src->get_name();
std::string dstName = "router_" + dst->get_name();
- route->gw_src = simgrid::s4u::Engine::get
Instance()->getNetpointByNameOrN
ull(srcName.c_str());
- route->gw_dst = simgrid::s4u::Engine::get
Instance()->getNetpointByNameOrN
ull(dstName.c_str());
+ route->gw_src = simgrid::s4u::Engine::get
_instance()->netpoint_by_name_or_n
ull(srcName.c_str());
+ route->gw_dst = simgrid::s4u::Engine::get
_instance()->netpoint_by_name_or_n
ull(dstName.c_str());
}
/* Retrieve the private links */
}
/* Retrieve the private links */
@@
-95,7
+95,7
@@
void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
if (info.first) {
route->link_list.push_back(info.first);
if (lat)
if (info.first) {
route->link_list.push_back(info.first);
if (lat)
- *lat += info.first->latency();
+ *lat += info.first->
get_
latency();
}
} else {
XBT_DEBUG("Source of private link (%u) doesn't exist", src->id());
}
} else {
XBT_DEBUG("Source of private link (%u) doesn't exist", src->id());
@@
-107,7
+107,7
@@
void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
if (info.second) {
route->link_list.push_back(info.second);
if (lat)
if (info.second) {
route->link_list.push_back(info.second);
if (lat)
- *lat += info.second->latency();
+ *lat += info.second->
get_
latency();
}
} else {
XBT_DEBUG("Destination of private link (%u) doesn't exist", dst->id());
}
} else {
XBT_DEBUG("Destination of private link (%u) doesn't exist", dst->id());
@@
-115,8
+115,8
@@
void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
/* Compute the extra latency due to the euclidean distance if needed */
if (lat) {
/* Compute the extra latency due to the euclidean distance if needed */
if (lat) {
- std::vector<double>* srcCoords =
getCoordsFromNetpoint
(src);
- std::vector<double>* dstCoords =
getCoordsFromNetpoint
(dst);
+ std::vector<double>* srcCoords =
netpoint_get_coords
(src);
+ std::vector<double>* dstCoords =
netpoint_get_coords
(dst);
double euclidean_dist =
sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) +
double euclidean_dist =
sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) +