Revert "Fixed full routing support for routers, no routing complexity is added router...

This reverts commit 7e2b05b2e2ec6a745966f800121782a684166f6f.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6711 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index ac58e67..7f042e7 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -68,13 +68,6 @@ typedef struct {
 /*
  * Parsing
  */
 /*
  * Parsing
  */

-static void routing_full_parse_Srouter(void) {
-  int *val = xbt_malloc(sizeof(int));
-  DEBUG2("Seen router %s (#%d)",A_surfxml_host_id,used_routing->host_count);
-  *val = used_routing->host_count++;
-  xbt_dict_set(used_routing->host_id,A_surfxml_host_id,val,xbt_free);
-}
-

 static void routing_full_parse_Shost(void) {
   int *val = xbt_malloc(sizeof(int));
   DEBUG2("Seen host %s (#%d)",A_surfxml_host_id,used_routing->host_count);
 static void routing_full_parse_Shost(void) {
   int *val = xbt_malloc(sizeof(int));
   DEBUG2("Seen host %s (#%d)",A_surfxml_host_id,used_routing->host_count);


@@ -318,7 +311,6 @@ static void routing_model_full_create(size_t size_of_link,void *loopback) {
   /* Setup the parsing callbacks we need */
   routing->generic_routing.host_id = xbt_dict_new();
   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
   /* Setup the parsing callbacks we need */
   routing->generic_routing.host_id = xbt_dict_new();
   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);

-  surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter);

   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_full_parse_end);
   surfxml_add_callback(STag_surfxml_route_cb_list,
       &routing_full_parse_Sroute_set_endpoints);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_full_parse_end);
   surfxml_add_callback(STag_surfxml_route_cb_list,
       &routing_full_parse_Sroute_set_endpoints);