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
Untabify.
[simgrid.git]
/
src
/
surf
/
surf_routing_dijkstra.cpp
diff --git
a/src/surf/surf_routing_dijkstra.cpp
b/src/surf/surf_routing_dijkstra.cpp
index
d3ae335
..
9cececc
100644
(file)
--- a/
src/surf/surf_routing_dijkstra.cpp
+++ b/
src/surf/surf_routing_dijkstra.cpp
@@
-5,7
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_routing_dijkstra.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_routing_dijkstra.hpp"
-#include "network.hpp"
+#include "network
_interface
.hpp"
/* Global vars */
extern routing_platf_t routing_platf;
/* Global vars */
extern routing_platf_t routing_platf;
@@
-184,7
+184,7
@@
xbt_dynar_t AsDijkstra::getOnelinkRoutes()
int src,dst;
RoutingEdgePtr src_elm, dst_elm;
int src,dst;
RoutingEdgePtr src_elm, dst_elm;
-
size_t table_size =
xbt_dynar_length(p_indexNetworkElm);
+
int table_size = (int)
xbt_dynar_length(p_indexNetworkElm);
for(src=0; src < table_size; src++) {
for(dst=0; dst< table_size; dst++) {
xbt_dynar_reset(route->link_list);
for(src=0; src < table_size; src++) {
for(dst=0; dst< table_size; dst++) {
xbt_dynar_reset(route->link_list);
@@
-258,7
+258,7
@@
void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
- *lat += dynamic_cast<Network
Cm02
LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+ *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
}
}
}
}
@@
-366,7
+366,7
@@
void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_insert_at(route->link_list, pos, &link);
if (lat)
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_insert_at(route->link_list, pos, &link);
if (lat)
- *lat += dynamic_cast<Network
Cm02
LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+ *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
pos++;
}
}
pos++;
}
}
@@
-375,7
+375,7
@@
void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
- *lat += dynamic_cast<Network
Cm02
LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+ *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
}
size++;
}
}
size++;
}
@@
-409,10
+409,17
@@
AsDijkstra::~AsDijkstra()
/* Creation routing model functions */
/* Creation routing model functions */
-AsDijkstra::AsDijkstra() : AsGeneric(), m_cached(0) {}
+AsDijkstra::AsDijkstra() : AsGeneric(), m_cached(0) {
+ p_routeGraph = NULL;
+ p_graphNodeMap = NULL;
+ p_routeCache = NULL;
+}
AsDijkstra::AsDijkstra(int cached) : AsGeneric(), m_cached(cached)
{
AsDijkstra::AsDijkstra(int cached) : AsGeneric(), m_cached(cached)
{
+ p_routeGraph = NULL;
+ p_graphNodeMap = NULL;
+ p_routeCache = NULL;
/*new_component->generic_routing.parse_route = model_dijkstra_both_parse_route;
new_component->generic_routing.parse_ASroute = model_dijkstra_both_parse_route;
new_component->generic_routing.get_route_and_latency = dijkstra_get_route_and_latency;
/*new_component->generic_routing.parse_route = model_dijkstra_both_parse_route;
new_component->generic_routing.parse_ASroute = model_dijkstra_both_parse_route;
new_component->generic_routing.get_route_and_latency = dijkstra_get_route_and_latency;
@@
-435,7
+442,7
@@
void AsDijkstra::end()
if(!p_graphNodeMap)
p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
if(!p_graphNodeMap)
p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
- if (m_cached && p_routeCache)
+ if (m_cached &&
!
p_routeCache)
p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free);
/* Add the loopback if needed */
p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free);
/* Add the loopback if needed */