From: navarro <navarro@caraja.(none)>
Date: Thu, 29 Mar 2012 12:16:16 +0000 (+0200)
Subject: none_get_route_and_latency must set latency to 0.
X-Git-Tag: v3_7~154
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a4fd78fffedc66dc0e6cf7b8978f1741c2e3d22e?hp=e369d8496fc4a486596f5f09c484280500697f0b

none_get_route_and_latency must set latency to 0.
---

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index d2de87b818..6ce1552706 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -95,7 +95,7 @@ struct s_model_type routing_models[] = {
   {"DijkstraCache",
    "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
    model_dijkstracache_create, model_dijkstra_both_end},
-  {"none", "No routing (usable with Constant network only)",
+  {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).",
    model_none_create,  NULL},
   {"RuleBased", "Rule-Based routing data (...)",
    model_rulebased_create, NULL},
diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index d4a598df46..cc1ef3cc06 100644
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -15,6 +15,7 @@ static xbt_dynar_t none_get_onelink_routes(AS_t rc) {
 static void none_get_route_and_latency(AS_t rc, network_element_t src, network_element_t dst,
                                        route_t res,double *lat)
 {
+  *lat = 0.0;
 }
 
 static route_t none_get_bypass_route(AS_t rc,