The code deal with <ASroute> in the exact same way than <route>. Disturbing

But kill the dupplicated/dead code anyway. This calls for further
cleanups, for example in the DTD...

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index a691131..34d1d00 100644 (file)
--- a/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@ -268,9 +268,7 @@ XBT_PUBLIC(void) sg_platf_new_cluster(sg_platf_cluster_cbarg_t clust); // Add a
 XBT_PUBLIC(void) sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet); // Add a cabinet to the currently described AS
 
 XBT_PUBLIC(void) sg_platf_new_route (sg_platf_route_cbarg_t route); // Add a route
-XBT_PUBLIC(void) sg_platf_new_ASroute (sg_platf_route_cbarg_t ASroute); // Add an ASroute
 XBT_PUBLIC(void) sg_platf_new_bypassRoute (sg_platf_route_cbarg_t bypassroute); // Add a bypassRoute
-XBT_PUBLIC(void) sg_platf_new_bypassASroute (sg_platf_route_cbarg_t bypassASroute); // Add an bypassASroute
 
 XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t trace);
 
@@ -285,9 +283,6 @@ XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process);
 XBT_PUBLIC(void) sg_platf_route_begin (sg_platf_route_cbarg_t route); // Initialize route
 XBT_PUBLIC(void) sg_platf_route_end (sg_platf_route_cbarg_t route); // Finalize and add a route
 
-XBT_PUBLIC(void) sg_platf_ASroute_begin (sg_platf_route_cbarg_t ASroute); // Initialize ASroute
-XBT_PUBLIC(void) sg_platf_ASroute_end (sg_platf_route_cbarg_t ASroute); // Finalize and add a ASroute
-
 XBT_PUBLIC(void) sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route); // Add a link to link list
 XBT_PUBLIC(void) sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASroute); // Add a link to link list
 

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index 71a7589..1200309 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -485,7 +485,7 @@ int console_add_ASroute(lua_State *L) {
   }
   lua_pop(L,1);
 
-  sg_platf_new_ASroute(&ASroute);
+  sg_platf_new_route(&ASroute);
 
   return 0;
 }

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 02017af..c9f920e 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -516,21 +516,11 @@ void sg_platf_new_route(sg_platf_route_cbarg_t route)
   routing_get_current()->parseRoute(route);
 }
 
-void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute)
-{
-  routing_get_current()->parseASroute(ASroute);
-}
-
 void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
 {
   routing_get_current()->parseBypassroute(bypassRoute);
 }
 
-void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute)
-{
-  routing_get_current()->parseBypassroute(bypassASroute);
-}
-
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
 {
   if (!simix_global)
@@ -630,16 +620,10 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
 void sg_platf_route_begin (sg_platf_route_cbarg_t route){
   route->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
-void sg_platf_ASroute_begin (sg_platf_route_cbarg_t ASroute){
-  ASroute->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-}
 
 void sg_platf_route_end (sg_platf_route_cbarg_t route){
   sg_platf_new_route(route);
 }
-void sg_platf_ASroute_end (sg_platf_route_cbarg_t ASroute){
-  sg_platf_new_ASroute(ASroute);
-}
 
 void sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route){
   char *link_name = xbt_strdup(link_id);

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index fbc8c5c..2502d0c 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -57,9 +57,6 @@ namespace surf {
   void As::parseRoute(sg_platf_route_cbarg_t /*route*/){
     THROW_IMPOSSIBLE; /* No. */
   }
-  void As::parseASroute(sg_platf_route_cbarg_t /*route*/){
-    THROW_IMPOSSIBLE;
-  }
   void As::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){
     THROW_IMPOSSIBLE;
   }

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index a34a85e..8442cee 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -101,7 +101,6 @@ public:
   /* Add content to the AS, at parsing time. It should be sealed afterward. */
   virtual int addComponent(NetCard *elm); /* A host, a router or an AS, whatever */
   virtual void parseRoute(sg_platf_route_cbarg_t route);
-  virtual void parseASroute(sg_platf_route_cbarg_t route);
   virtual void parseBypassroute(sg_platf_route_cbarg_t e_route);
 };
 

diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp
index 5211683..ec006a6 100644 (file)
--- a/src/surf/surf_routing_dijkstra.cpp
+++ b/src/surf/surf_routing_dijkstra.cpp
@@ -403,14 +403,6 @@ AsDijkstra::AsDijkstra(const char*name, bool 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.get_onelink_routes =
-      dijkstra_get_onelink_routes;
-  new_component->generic_routing.get_graph = generic_get_graph;
-  new_component->generic_routing.finalize = dijkstra_finalize;
-  new_component->cached = cached;*/
 }
 
 void AsDijkstra::end()
@@ -442,11 +434,6 @@ void AsDijkstra::end()
 
 }
 
-void AsDijkstra::parseASroute(sg_platf_route_cbarg_t route)
-{
-  parseRoute(route);
-}
-
 void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
 {
   char *src = (char*)(route->src);

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index 74a33cb..3f34c96 100644 (file)
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -60,7 +60,6 @@ public:
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) override;
   xbt_dynar_t getOneLinkRoutes() override;
   void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat); // FIXME: this function is dangerously not overriding because of diverging prototype
-  void parseASroute(sg_platf_route_cbarg_t route) override;
   void parseRoute(sg_platf_route_cbarg_t route) override;
   void end();
 

diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp
index 49022bb..724e4e5 100644 (file)
--- a/src/surf/surf_routing_floyd.cpp
+++ b/src/surf/surf_routing_floyd.cpp
@@ -132,10 +132,6 @@ static int floyd_pointer_resource_cmp(const void *a, const void *b) {
   return a != b;
 }
 
-void AsFloyd::parseASroute(sg_platf_route_cbarg_t route){
-  parseRoute(route);
-}
-
 void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
 {
   char *src = (char*)(route->src);

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index 3da98f1..90016cb 100644 (file)
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -28,7 +28,6 @@ public:
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   xbt_dynar_t getOneLinkRoutes() override;
-  void parseASroute(sg_platf_route_cbarg_t route) override;
   void parseRoute(sg_platf_route_cbarg_t route) override;
   void Seal() override;
 

diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp
index 16a27d4..151db08 100644 (file)
--- a/src/surf/surf_routing_full.cpp
+++ b/src/surf/surf_routing_full.cpp
@@ -125,10 +125,6 @@ void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg
   }
 }
 
-void AsFull::parseASroute(sg_platf_route_cbarg_t route){
-  parseRoute(route);
-}
-
 static int full_pointer_resource_cmp(const void *a, const void *b)
 {
   return a != b;

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index 76edfe6..91de4a4 100644 (file)
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -30,7 +30,6 @@ public:
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   xbt_dynar_t getOneLinkRoutes() override;
   void parseRoute(sg_platf_route_cbarg_t route) override;
-  void parseASroute(sg_platf_route_cbarg_t route) override;
 
   sg_platf_route_cbarg_t *p_routingTable = nullptr;
 };

diff --git a/src/surf/surfxml_parse.cpp b/src/surf/surfxml_parse.cpp
index 02b205b..48710f3 100644 (file)
--- a/src/surf/surfxml_parse.cpp
+++ b/src/surf/surfxml_parse.cpp
@@ -812,7 +812,7 @@ void ETag_surfxml_ASroute(void){
     break;
   }
 
-  sg_platf_new_ASroute(&ASroute);
+  sg_platf_new_route(&ASroute);
   parsed_link_list = NULL;
 }
 
@@ -843,7 +843,7 @@ void ETag_surfxml_bypassASroute(void){
   ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src);
   ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
 
-  sg_platf_new_bypassASroute(&ASroute);
+  sg_platf_new_bypassRoute(&ASroute);
   parsed_link_list = NULL;
 }