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
Small typos in comments
[simgrid.git]
/
src
/
kernel
/
routing
/
NetZoneImpl.cpp
diff --git
a/src/kernel/routing/NetZoneImpl.cpp
b/src/kernel/routing/NetZoneImpl.cpp
index 903023329eb1fe765d8797efa603694254d28eef..08df429aca37cc42f841d408e77fd88533b83b16 100644
(file)
--- a/
src/kernel/routing/NetZoneImpl.cpp
+++ b/
src/kernel/routing/NetZoneImpl.cpp
@@
-622,8
+622,8
@@
void NetZoneImpl::get_graph(const s_xbt_graph_t* graph, std::map<std::string, xb
{
std::vector<NetPoint*> vertices = get_vertices();
- for (auto const
&
my_src : vertices) {
- for (auto const
&
my_dst : vertices) {
+ for (auto const
*
my_src : vertices) {
+ for (auto const
*
my_dst : vertices) {
if (my_src == my_dst)
continue;
@@
-669,6
+669,24
@@
void NetZoneImpl::get_graph(const s_xbt_graph_t* graph, std::map<std::string, xb
}
}
+void NetZoneImpl::set_gateway(const std::string& name, NetPoint* router)
+{
+ xbt_enforce(not sealed_, "Impossible to create gateway: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ if (auto gateway_it = gateways_.find(name); gateway_it != gateways_.end())
+ xbt_die("Impossible to create a gateway named %s. It already exists", name.c_str());
+ else
+ gateways_[name] = router;
+}
+
+NetPoint* NetZoneImpl::get_gateway() const
+{
+ xbt_enforce(not gateways_.empty(), "No default gateway has been defined for NetZone '%s'. Try to seal it first", get_cname());
+ xbt_enforce(gateways_.size() < 2, "NetZone '%s' has more than one gateway, please provide a gateway name", get_cname());
+ auto gateway_it = gateways_.find("default");
+ xbt_enforce(gateway_it != gateways_.end(), "NetZone '%s' hasno default gateway, please define one", get_cname());
+ return gateway_it->second;
+}
+
void NetZoneImpl::seal()
{
/* already sealed netzone */
@@
-676,6
+694,10
@@
void NetZoneImpl::seal()
return;
do_seal(); // derived class' specific sealing procedure
+ // for zone with a single host, this host is its own default gateway
+ if (gateways_.empty() && hosts_.size() == 1)
+ gateways_["default"] = hosts_.begin()->second->get_iface()->get_netpoint();
+
/* seals sub-netzones and hosts */
for (auto* host : get_all_hosts()) {
host->seal();