Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[routing] clarify why we rely on such a dirty hack
authorMartin Quinson <martin.quinson@loria.fr>
Mon, 9 Apr 2012 02:28:51 +0000 (16:28 -1000)
committerMartin Quinson <martin.quinson@loria.fr>
Mon, 9 Apr 2012 02:28:51 +0000 (16:28 -1000)
src/surf/surf_routing.c
src/surf/surf_routing_rulebased.c

index 0d0408b..a5720ea 100644 (file)
@@ -316,8 +316,12 @@ static void routing_parse_E_ASroute(void)
   e_route->link_list = parsed_link_list;
 
   if (!strcmp(current_routing->model_desc->name,"RuleBased")) {
-    e_route->src_gateway = (sg_routing_edge_t) gw_src; // DIRTY HACK possible only FIXME
-    e_route->dst_gateway = (sg_routing_edge_t) gw_dst; // because of what is in routing_parse_E_ASroute
+    // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
+    // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows)
+    //
+    // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
+    e_route->src_gateway = (sg_routing_edge_t) gw_src;
+    e_route->dst_gateway = (sg_routing_edge_t) gw_dst;
   } else {
     e_route->src_gateway = sg_routing_edge_by_name_or_null(gw_src);
     e_route->dst_gateway = sg_routing_edge_by_name_or_null(gw_dst);
index e7aecf4..c223032 100644 (file)
@@ -131,8 +131,13 @@ static void model_rulebased_parse_ASroute(AS_t rc,
       erroffset, dst, error);
   ruleroute_e->generic_rule_route.re_str_link =
       route->link_list;
-  ruleroute_e->re_src_gateway = xbt_strdup((char *)route->src_gateway); // DIRTY HACK possible only
-  ruleroute_e->re_dst_gateway = xbt_strdup((char *)route->dst_gateway); // because of what is in routing_parse_E_ASroute
+
+  // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
+  // store the provided name instead of the entity directly (routing_parse_E_ASroute knows)
+  //
+  // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
+  ruleroute_e->re_src_gateway = xbt_strdup((char *)route->src_gateway);
+  ruleroute_e->re_dst_gateway = xbt_strdup((char *)route->dst_gateway);
   xbt_dynar_push(routing->list_ASroute, &ruleroute_e);
 
   /* make sure that they don't get freed */