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
string++ and static_cast too
[simgrid.git]
/
src
/
kernel
/
routing
/
DijkstraZone.cpp
diff --git
a/src/kernel/routing/DijkstraZone.cpp
b/src/kernel/routing/DijkstraZone.cpp
index
08fd443
..
d0e07ee
100644
(file)
--- a/
src/kernel/routing/DijkstraZone.cpp
+++ b/
src/kernel/routing/DijkstraZone.cpp
@@
-45,7
+45,8
@@
namespace routing {
void DijkstraZone::seal()
{
xbt_node_t node = nullptr;
void DijkstraZone::seal()
{
xbt_node_t node = nullptr;
- unsigned int cursor2, cursor;
+ unsigned int cursor2;
+ unsigned int cursor;
/* Create the topology graph */
if (!routeGraph_)
/* Create the topology graph */
if (!routeGraph_)
@@
-68,7
+69,7
@@
void DijkstraZone::seal()
if (!found) {
sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
if (!found) {
sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- e_route->link_list = new std::vector<
Link
*>();
+ e_route->link_list = new std::vector<
surf::LinkImpl
*>();
e_route->link_list->push_back(surf_network_model->loopback_);
xbt_graph_new_edge(routeGraph_, node, node, e_route);
}
e_route->link_list->push_back(surf_network_model->loopback_);
xbt_graph_new_edge(routeGraph_, node, node, e_route);
}
@@
-86,16
+87,12
@@
void DijkstraZone::seal()
xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id)
{
xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id)
{
- xbt_node_t node = nullptr;
- graph_node_data_t data = nullptr;
- graph_node_map_element_t elm = nullptr;
-
- data = xbt_new0(struct graph_node_data, 1);
+ graph_node_data_t data = xbt_new0(struct graph_node_data, 1);
data->id = id;
data->graph_id = graph_id;
data->id = id;
data->graph_id = graph_id;
- node = xbt_graph_new_node(routeGraph_, data);
- elm = xbt_new0(struct graph_node_map_element, 1);
+ xbt_node_t node = xbt_graph_new_node(routeGraph_, data);
+ graph_node_map_element_t elm = xbt_new0(struct graph_node_map_element, 1);
elm->node = node;
xbt_dict_set_ext(graphNodeMap_, (char*)(&id), sizeof(int), (xbt_dictelm_t)elm, nullptr);
elm->node = node;
xbt_dict_set_ext(graphNodeMap_, (char*)(&id), sizeof(int), (xbt_dictelm_t)elm, nullptr);
@@
-173,7
+170,7
@@
void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb
for (auto link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
for (auto link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
- *lat += static_cast<
Link
*>(link)->latency();
+ *lat += static_cast<
surf::LinkImpl
*>(link)->latency();
}
}
}
}
@@
-209,7
+206,7
@@
void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb
/* apply dijkstra using the indexes from the graph's node array */
while (xbt_heap_size(pqueue) > 0) {
/* apply dijkstra using the indexes from the graph's node array */
while (xbt_heap_size(pqueue) > 0) {
- int* v_id =
(int*)xbt_heap_pop(pqueue
);
+ int* v_id =
static_cast<int*>(xbt_heap_pop(pqueue)
);
xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
xbt_edge_t edge = nullptr;
unsigned int cursor;
xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
xbt_edge_t edge = nullptr;
unsigned int cursor;
@@
-239,7
+236,10
@@
void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb
}
/* compose route path with links */
}
/* compose route path with links */
- NetPoint *gw_src = nullptr, *gw_dst, *prev_gw_src, *first_gw = nullptr;
+ NetPoint *gw_src = nullptr;
+ NetPoint *gw_dst;
+ NetPoint *prev_gw_src;
+ NetPoint *first_gw = nullptr;
NetPoint *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr;
for (int v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
NetPoint *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr;
for (int v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
@@
-261,11
+261,11
@@
void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb
if (hierarchy_ == RoutingMode::recursive && v != dst_node_id &&
strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) {
if (hierarchy_ == RoutingMode::recursive && v != dst_node_id &&
strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) {
- std::vector<
Link*>* e_route_as_to_as = new std::vector<Link*>()
;
+ std::vector<
surf::LinkImpl*> e_route_as_to_as
;
- getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr);
+ getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm,
&
e_route_as_to_as, nullptr);
auto pos = route->link_list->begin();
auto pos = route->link_list->begin();
- for (auto link :
*
e_route_as_to_as) {
+ for (auto link : e_route_as_to_as) {
route->link_list->insert(pos, link);
if (lat)
*lat += link->latency();
route->link_list->insert(pos, link);
if (lat)
*lat += link->latency();
@@
-276,7
+276,7
@@
void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb
for (auto link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
for (auto link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
- *lat += static_cast<
Link
*>(link)->latency();
+ *lat += static_cast<
surf::LinkImpl
*>(link)->latency();
}
size++;
}
}
size++;
}