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
Raise exception for invalid parameters in StarZone
[simgrid.git]
/
src
/
kernel
/
routing
/
FullZone.cpp
diff --git
a/src/kernel/routing/FullZone.cpp
b/src/kernel/routing/FullZone.cpp
index
b7c0f33
..
ab756c1
100644
(file)
--- a/
src/kernel/routing/FullZone.cpp
+++ b/
src/kernel/routing/FullZone.cpp
@@
-16,12
+16,8
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
namespace simgrid {
namespace kernel {
namespace routing {
namespace simgrid {
namespace kernel {
namespace routing {
-FullZone::FullZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
- : RoutedZone(father, name, netmodel)
-{
-}
-void FullZone::seal()
+void FullZone::
do_
seal()
{
unsigned int table_size = get_table_size();
{
unsigned int table_size = get_table_size();
@@
-30,7
+26,7
@@
void FullZone::seal()
routing_table_.resize(table_size * table_size, nullptr);
/* Add the loopback if needed */
routing_table_.resize(table_size * table_size, nullptr);
/* Add the loopback if needed */
- if (get_network_model()->loopback_ &&
hierarchy_
== RoutingMode::base) {
+ if (get_network_model()->loopback_ &&
get_hierarchy()
== RoutingMode::base) {
for (unsigned int i = 0; i < table_size; i++) {
RouteCreationArgs* route = TO_ROUTE_FULL(i, i);
if (not route) {
for (unsigned int i = 0; i < table_size; i++) {
RouteCreationArgs* route = TO_ROUTE_FULL(i, i);
if (not route) {
@@
-53,7
+49,7
@@
void FullZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
{
XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
{
XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
- unsigned int table_size = get_table_size();
+ unsigned int table_size
= get_table_size();
const RouteCreationArgs* e_route = TO_ROUTE_FULL(src->id(), dst->id());
if (e_route != nullptr) {
const RouteCreationArgs* e_route = TO_ROUTE_FULL(src->id(), dst->id());
if (e_route != nullptr) {
@@
-68,7
+64,7
@@
void FullZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
}
void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
}
void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
+
const
std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
{
add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
@@
-88,7
+84,7
@@
void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoin
dst->get_cname());
/* Add the route to the base */
dst->get_cname());
/* Add the route to the base */
- TO_ROUTE_FULL(src->id(), dst->id()) = new_extended_route(
hierarchy_
, gw_src, gw_dst, link_list, true);
+ TO_ROUTE_FULL(src->id(), dst->id()) = new_extended_route(
get_hierarchy()
, gw_src, gw_dst, link_list, true);
if (symmetrical && src != dst) {
if (gw_dst && gw_src) {
if (symmetrical && src != dst) {
if (gw_dst && gw_src) {
@@
-106,9
+102,17
@@
void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoin
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->get_cname(), src->get_cname());
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->get_cname(), src->get_cname());
- TO_ROUTE_FULL(dst->id(), src->id()) = new_extended_route(
hierarchy_
, gw_src, gw_dst, link_list, false);
+ TO_ROUTE_FULL(dst->id(), src->id()) = new_extended_route(
get_hierarchy()
, gw_src, gw_dst, link_list, false);
}
}
}
}
+} // namespace routing
+} // namespace kernel
+
+namespace s4u {
+NetZone* create_full_zone(const std::string& name)
+{
+ return (new kernel::routing::FullZone(name))->get_iface();
}
}
-}
-} // namespace
+} // namespace s4u
+
+} // namespace simgrid