X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bbab4619c1dbcfedc93e2d14812a684119c75136..35e807ba0b8341d3d001560693ecb0be4ff8ca90:/src/surf/surf_routing_vivaldi.c?ds=inline

diff --git a/src/surf/surf_routing_vivaldi.c b/src/surf/surf_routing_vivaldi.c
index d53c81233f..fe92bb4961 100644
--- a/src/surf/surf_routing_vivaldi.c
+++ b/src/surf/surf_routing_vivaldi.c
@@ -7,34 +7,18 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
 
-/* Routing model structure */
-
-typedef struct {
-  s_routing_component_t generic_routing;
-  xbt_dict_t dict_processing_units;
-  xbt_dict_t dict_autonomous_systems;
-} s_routing_component_vivaldi_t, *routing_component_vivaldi_t;
-
-/* Parse routing model functions */
-
-static route_extended_t vivaldi_get_route(routing_component_t rc,
-                                            const char *src,
-                                            const char *dst);
-
 /* Business methods */
-static route_extended_t vivaldi_get_route(routing_component_t rc,
-                                            const char *src,
-                                            const char *dst)
+static route_t vivaldi_get_route(AS_t rc, const char *src, const char *dst)
 {
 	  xbt_assert(rc && src
 	              && dst,
 	              "Invalid params for \"get_route\" function at AS \"%s\"",
 	              rc->name);
 
-	  route_extended_t new_e_route = xbt_new0(s_route_extended_t, 1);
+	  route_t new_e_route = xbt_new0(s_route_t, 1);
 	  new_e_route->src_gateway = ROUTER_PEER(src);
 	  new_e_route->dst_gateway = ROUTER_PEER(dst);
-	  new_e_route->generic_route.link_list =  xbt_dynar_new(0, NULL);
+	  new_e_route->link_list =  xbt_dynar_new(0, NULL);
 	  return new_e_route;
 }
 
@@ -42,6 +26,7 @@ static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
 {
 	double src_coord, dst_coord;
 
+	// FIXME converting from string to float each time we need a coordinate is ... suboptimal
 	src_coord = atof(xbt_dynar_get_as(src, index, char *));
 	dst_coord = atof(xbt_dynar_get_as(dst, index, char *));
 
@@ -64,20 +49,18 @@ static double base_vivaldi_get_latency (const char *src, const char *dst)
   euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn))
   				 + fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *)));
 
-  xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist);
-
   //From .ms to .s
   return euclidean_dist / 1000;
 }
 
-static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst, route_extended_t e_route)
+static double vivaldi_get_latency (AS_t rc,const char *src, const char *dst, route_t e_route)
 {
-  if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
+  if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
 	  int need_to_clean = e_route?0:1;
 	  double latency;
-	  e_route = e_route?e_route:(*(rc->get_route)) (rc, src, dst);
+	  e_route = e_route ? e_route : rc->get_route(rc, src, dst);
 	  latency = base_vivaldi_get_latency(e_route->src_gateway,e_route->dst_gateway);
-	  if(need_to_clean) generic_free_extended_route(e_route);
+	  if(need_to_clean) generic_free_route(e_route);
 	  return latency;
   } else {
 	  return base_vivaldi_get_latency(src,dst);
@@ -85,10 +68,10 @@ static double vivaldi_get_link_latency (routing_component_t rc,const char *src,
 }
 
 /* Creation routing model functions */
-void *model_vivaldi_create(void)
+AS_t model_vivaldi_create(void)
 {
-	  routing_component_vivaldi_t new_component = model_none_create();
-	  new_component->generic_routing.get_route = vivaldi_get_route;
-	  new_component->generic_routing.get_latency = vivaldi_get_link_latency;
+	  AS_t new_component = model_rulebased_create();
+	  new_component->get_route = vivaldi_get_route;
+	  new_component->get_latency = vivaldi_get_latency;
 	  return new_component;
 }