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
update function documentation and variable names in the As -> NetZone transition
[simgrid.git]
/
src
/
kernel
/
routing
/
VivaldiZone.cpp
diff --git
a/src/kernel/routing/VivaldiZone.cpp
b/src/kernel/routing/VivaldiZone.cpp
index
a04f1e9
..
e665695
100644
(file)
--- a/
src/kernel/routing/VivaldiZone.cpp
+++ b/
src/kernel/routing/VivaldiZone.cpp
@@
-50,7
+50,7
@@
static std::vector<double>* getCoordsFromNetcard(NetCard* nc)
{
simgrid::kernel::routing::vivaldi::Coords* coords = nc->extension<simgrid::kernel::routing::vivaldi::Coords>();
xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",
- (nc->is
AS
() ? "AS" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc);
+ (nc->is
NetZone
() ? "AS" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc);
return &coords->coords;
}
VivaldiZone::VivaldiZone(NetZone* father, const char* name) : ClusterZone(father, name)
@@
-59,7
+59,7
@@
VivaldiZone::VivaldiZone(NetZone* father, const char* name) : ClusterZone(father
void VivaldiZone::setPeerLink(NetCard* netcard, double bw_in, double bw_out, double latency, const char* coord)
{
- xbt_assert(netcard->
containingAS
() == this, "Cannot add a peer link to a netcard that is not in this AS");
+ xbt_assert(netcard->
netzone
() == this, "Cannot add a peer link to a netcard that is not in this AS");
new simgrid::kernel::routing::vivaldi::Coords(netcard, coord);
@@
-77,7
+77,7
@@
void VivaldiZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg
{
XBT_DEBUG("vivaldi getLocalRoute from '%s'[%d] '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id());
- if (src->is
AS
()) {
+ if (src->is
NetZone
()) {
char* srcName = bprintf("router_%s", src->cname());
char* dstName = bprintf("router_%s", dst->cname());
route->gw_src = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib, srcName, ROUTING_ASR_LEVEL);