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
ContextUnix: reorganize like Boost and Raw contexts.
[simgrid.git]
/
src
/
kernel
/
routing
/
RoutedZone.cpp
diff --git
a/src/kernel/routing/RoutedZone.cpp
b/src/kernel/routing/RoutedZone.cpp
index
fb5db13
..
0263235
100644
(file)
--- a/
src/kernel/routing/RoutedZone.cpp
+++ b/
src/kernel/routing/RoutedZone.cpp
@@
-18,7
+18,7
@@
void routing_route_free(sg_platf_route_cbarg_t route)
{
if (route) {
delete route->link_list;
-
xbt_free(route)
;
+
delete route
;
}
}
@@
-31,34
+31,36
@@
static const char* instr_node_name(xbt_node_t node)
return static_cast<const char*>(data);
}
-xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,
xbt_dict_t
nodes)
+xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,
std::map<std::string, xbt_node_t>*
nodes)
{
- xbt_node_t ret = static_cast<xbt_node_t>(xbt_dict_get_or_null(nodes, name));
- if (ret)
- return ret;
- ret = xbt_graph_new_node(graph, xbt_strdup(name));
- xbt_dict_set(nodes, name, ret, nullptr);
- return ret;
+ auto elm = nodes->find(name);
+ if (elm == nodes->end()) {
+ xbt_node_t ret = xbt_graph_new_node(graph, xbt_strdup(name));
+ nodes->insert({name, ret});
+ return ret;
+ } else
+ return elm->second;
}
-xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d,
xbt_dict_t
edges)
+xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d,
std::map<std::string, xbt_edge_t>*
edges)
{
const char* sn = instr_node_name(s);
const char* dn = instr_node_name(d);
std::string name = std::string(sn) + dn;
-
xbt_edge_t ret = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str())
);
- if (
ret == nullptr
) {
+
auto elm = edges->find(name
);
+ if (
elm == edges->end()
) {
name = std::string(dn) + sn;
-
ret = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str())
);
+
elm = edges->find(name
);
}
- if (ret == nullptr) {
- ret = xbt_graph_new_edge(graph, s, d, nullptr);
- xbt_dict_set(edges, name.c_str(), ret, nullptr);
- }
- return ret;
+ if (elm == edges->end()) {
+ xbt_edge_t ret = xbt_graph_new_edge(graph, s, d, nullptr);
+ edges->insert({name, ret});
+ return ret;
+ } else
+ return elm->second;
}
namespace simgrid {
@@
-69,7
+71,8
@@
RoutedZone::RoutedZone(NetZone* father, std::string name) : NetZoneImpl(father,
{
}
-void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
+void RoutedZone::getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+ std::map<std::string, xbt_edge_t>* edges)
{
std::vector<kernel::routing::NetPoint*> vertices = getVertices();
@@
-78,12
+81,12
@@
void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
if (my_src == my_dst)
continue;
- sg_platf_route_cbarg_t route =
xbt_new0(s_sg_platf_route_cbarg_t, 1)
;
+ sg_platf_route_cbarg_t route =
new s_sg_platf_route_cbarg_t
;
route->link_list = new std::vector<surf::LinkImpl*>();
getLocalRoute(my_src, my_dst, route, nullptr);
- XBT_DEBUG("get_route_and_latency %s -> %s", my_src->
cname(), my_dst->c
name());
+ XBT_DEBUG("get_route_and_latency %s -> %s", my_src->
getCname(), my_dst->getC
name());
xbt_node_t current;
xbt_node_t previous;
@@
-91,15
+94,15
@@
void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
const char *current_name;
if (route->gw_src) {
- previous = new_xbt_graph_node(graph, route->gw_src->
c
name(), nodes);
- previous_name = route->gw_src->
c
name();
+ previous = new_xbt_graph_node(graph, route->gw_src->
getC
name(), nodes);
+ previous_name = route->gw_src->
getC
name();
} else {
- previous = new_xbt_graph_node(graph, my_src->
c
name(), nodes);
- previous_name = my_src->
c
name();
+ previous = new_xbt_graph_node(graph, my_src->
getC
name(), nodes);
+ previous_name = my_src->
getC
name();
}
for (auto const& link : *route->link_list) {
- const char* link_name = link->
c
name();
+ const char* link_name = link->
getC
name();
current = new_xbt_graph_node(graph, link_name, nodes);
current_name = link_name;
new_xbt_graph_edge(graph, previous, current, edges);
@@
-109,17
+112,17
@@
void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
}
if (route->gw_dst) {
- current = new_xbt_graph_node(graph, route->gw_dst->
c
name(), nodes);
- current_name = route->gw_dst->
c
name();
+ current = new_xbt_graph_node(graph, route->gw_dst->
getC
name(), nodes);
+ current_name = route->gw_dst->
getC
name();
} else {
- current = new_xbt_graph_node(graph, my_dst->
c
name(), nodes);
- current_name = my_dst->
c
name();
+ current = new_xbt_graph_node(graph, my_dst->
getC
name(), nodes);
+ current_name = my_dst->
getC
name();
}
new_xbt_graph_edge(graph, previous, current, edges);
XBT_DEBUG(" %s -> %s", previous_name, current_name);
delete route->link_list;
-
xbt_free(route)
;
+
delete route
;
}
}
}
@@
-132,7
+135,7
@@
sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
{
sg_platf_route_cbarg_t result;
- result =
xbt_new0(s_sg_platf_route_cbarg_t, 1)
;
+ result =
new s_sg_platf_route_cbarg_t
;
result->link_list = new std::vector<surf::LinkImpl*>();
xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
@@
-158,28
+161,28
@@
sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
void RoutedZone::getRouteCheckParams(NetPoint* src, NetPoint* dst)
{
- xbt_assert(src, "Cannot find a route from nullptr to %s", dst->
c
name());
- xbt_assert(dst, "Cannot find a route from %s to nullptr", src->
c
name());
+ xbt_assert(src, "Cannot find a route from nullptr to %s", dst->
getC
name());
+ xbt_assert(dst, "Cannot find a route from %s to nullptr", src->
getC
name());
NetZone* src_as = src->netzone();
NetZone* dst_as = dst->netzone();
xbt_assert(src_as == dst_as,
"Internal error: %s@%s and %s@%s are not in the same netzone as expected. Please report that bug.",
- src->
cname(), src_as->getCname(), dst->c
name(), dst_as->getCname());
+ src->
getCname(), src_as->getCname(), dst->getC
name(), dst_as->getCname());
xbt_assert(this == dst_as, "Internal error: route destination %s@%s is not in netzone %s as expected (route source: "
"%s@%s). Please report that bug.",
- src->
cname(), dst->c
name(), src_as->getCname(), dst_as->getCname(), getCname());
+ src->
getCname(), dst->getC
name(), src_as->getCname(), dst_as->getCname(), getCname());
}
void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
{
NetPoint* src = route->src;
NetPoint* dst = route->dst;
- const char* srcName = src->
c
name();
- const char* dstName = dst->
c
name();
+ const char* srcName = src->
getC
name();
+ const char* dstName = dst->
getC
name();
- if (not route->gw_dst
&&
not route->gw_src) {
+ if (not route->gw_dst
||
not route->gw_src) {
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);
xbt_assert(src, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, srcName);
xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName);
@@
-191,7
+194,8
@@
void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
"When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?",
dstName);
} else {
- XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname());
+ XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, route->gw_src->getCname(), dstName,
+ route->gw_dst->getCname());
xbt_assert(src->isNetZone(), "When defining a NetzoneRoute, src must be a netzone but '%s' is not", srcName);
xbt_assert(dst->isNetZone(), "When defining a NetzoneRoute, dst must be a netzone but '%s' is not", dstName);
@@
-200,14
+204,15
@@
void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
xbt_assert(route->gw_dst->isHost() || route->gw_dst->isRouter(),
"When defining a NetzoneRoute, gw_dst must be an host or a router but '%s' is not.", dstName);
- xbt_assert(route->gw_src != route->gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", route->gw_src->cname());
+ xbt_assert(route->gw_src != route->gw_dst, "Cannot define an NetzoneRoute from '%s' to itself",
+ route->gw_src->getCname());
- xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->
c
name(),
- dstName, route->gw_dst->
c
name(), srcName);
- xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->
c
name(),
- dstName, route->gw_dst->
c
name(), dstName);
+ xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->
getC
name(),
+ dstName, route->gw_dst->
getC
name(), srcName);
+ xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->
getC
name(),
+ dstName, route->gw_dst->
getC
name(), dstName);
xbt_assert(not route->link_list->empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName,
- route->gw_src->
cname(), dstName, route->gw_dst->c
name());
+ route->gw_src->
getCname(), dstName, route->gw_dst->getC
name());
}
onRouteCreation(route->symmetrical, route->src, route->dst, route->gw_src, route->gw_dst, route->link_list);