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
Move forward declaration in simgrid/forward.h.
[simgrid.git]
/
src
/
kernel
/
routing
/
DragonflyZone.cpp
diff --git
a/src/kernel/routing/DragonflyZone.cpp
b/src/kernel/routing/DragonflyZone.cpp
index
d6eecc5
..
6b6f2c7
100644
(file)
--- a/
src/kernel/routing/DragonflyZone.cpp
+++ b/
src/kernel/routing/DragonflyZone.cpp
@@
-112,7
+112,7
@@
void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster)
throw std::invalid_argument(std::string("Last parameter is not the amount of nodes per blade:") + parameters[3]);
}
throw std::invalid_argument(std::string("Last parameter is not the amount of nodes per blade:") + parameters[3]);
}
- if (cluster->sharing_policy == SURF_LINK_
FULL
DUPLEX)
+ if (cluster->sharing_policy == SURF_LINK_
SPLIT
DUPLEX)
this->numLinksperLink_ = 2;
this->cluster_ = cluster;
this->numLinksperLink_ = 2;
this->cluster_ = cluster;
@@
-168,7
+168,7
@@
void DragonflyZone::createLink(const std::string& id, int numlinks, surf::LinkIm
sg_platf_new_link(&linkTemplate);
XBT_DEBUG("Generating link %s", id.c_str());
surf::LinkImpl* link;
sg_platf_new_link(&linkTemplate);
XBT_DEBUG("Generating link %s", id.c_str());
surf::LinkImpl* link;
- if (this->cluster_->sharing_policy == SURF_LINK_
FULL
DUPLEX) {
+ if (this->cluster_->sharing_policy == SURF_LINK_
SPLIT
DUPLEX) {
*linkup = surf::LinkImpl::byName(linkTemplate.id + "_UP"); // check link?
*linkdown = surf::LinkImpl::byName(linkTemplate.id + "_DOWN"); // check link ?
} else {
*linkup = surf::LinkImpl::byName(linkTemplate.id + "_UP"); // check link?
*linkdown = surf::LinkImpl::byName(linkTemplate.id + "_DOWN"); // check link ?
} else {
@@
-199,7
+199,7
@@
void DragonflyZone::generateLinks()
this->createLink(id, 1, &linkup, &linkdown);
this->routers_[i]->myNodes_[j] = linkup;
this->createLink(id, 1, &linkup, &linkdown);
this->routers_[i]->myNodes_[j] = linkup;
- if (this->cluster_->sharing_policy == SURF_LINK_
FULL
DUPLEX)
+ if (this->cluster_->sharing_policy == SURF_LINK_
SPLIT
DUPLEX)
this->routers_[i]->myNodes_[j + 1] = linkdown;
uniqueId++;
this->routers_[i]->myNodes_[j + 1] = linkdown;
uniqueId++;
@@
-260,7
+260,7
@@
void DragonflyZone::generateLinks()
}
}
}
}
-void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst,
sg_platf_route_cbarg_t
route, double* latency)
+void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst,
RouteCreationArgs*
route, double* latency)
{
// Minimal routing version.
// TODO : non-minimal random one, and adaptive ?
{
// Minimal routing version.
// TODO : non-minimal random one, and adaptive ?