I comment all the calls to used_routing, in order to use global routing.

[simgrid.git] / src / surf / surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index e3148b6..a2afeae 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -95,7 +95,6 @@ xbt_dynar_t ETag_surfxml_AS_cb_list = NULL;  // addded by david
 xbt_dynar_t STag_surfxml_gateway_cb_list = NULL;  // addded by david
 xbt_dynar_t ETag_surfxml_gateway_cb_list = NULL;  // addded by david
 
-
 /* Stores the sets defined in the XML */
 xbt_dict_t set_list = NULL;
 
@@ -184,8 +183,10 @@ void surf_parse_reset_parser(void)
   ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-  STag_surfxml_link_c_ctn_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-  ETag_surfxml_link_c_ctn_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  STag_surfxml_link_c_ctn_cb_list =
+    xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  ETag_surfxml_link_c_ctn_cb_list =
+    xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_process_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_process_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_argument_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
@@ -196,14 +197,18 @@ void surf_parse_reset_parser(void)
   ETag_surfxml_set_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_foreach_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_foreach_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-  STag_surfxml_route_c_multi_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-  ETag_surfxml_route_c_multi_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  STag_surfxml_route_c_multi_cb_list =
+    xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  ETag_surfxml_route_c_multi_cb_list =
+    xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_cluster_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_cluster_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-  STag_surfxml_trace_c_connect_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-  ETag_surfxml_trace_c_connect_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  STag_surfxml_trace_c_connect_cb_list =
+    xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  ETag_surfxml_trace_c_connect_cb_list =
+    xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);  // addded by david
@@ -587,22 +592,22 @@ static void init_data(void)
   trace_connect_list_latency = xbt_dict_new();
 
   random_data_list = xbt_dict_new();
-  
-// commented by david
-
-//   surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
-//   surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
-//   surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
-//   surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
-//   surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_Stag_route_multi);
-//   surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_Etag_route_multi);
-//   surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_Stag_foreach);
-//   surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_Stag_trace);
-//   surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace);
-//   surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_Stag_trace_c_connect);
-//   surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness);
-//   surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness);
-
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+  surfxml_add_callback(STag_surfxml_route_cb_list,
+                       &parse_route_set_endpoints);
+  surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
+  surfxml_add_callback(STag_surfxml_route_c_multi_cb_list,
+                       &parse_Stag_route_multi);
+  surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list,
+                       &parse_Etag_route_multi);
+  surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_Stag_foreach);
+  surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_Stag_trace);
+  surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace);
+  surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list,
+                       &parse_Stag_trace_c_connect);
+  surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness);
+  surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness);
 }
 
 static void free_data(void)
@@ -1292,7 +1297,7 @@ void surf_add_route_element(char* link_ctn_id)
 void surf_route_set_resource(char *source_id,char *destination_id,xbt_dynar_t links_id,int action)
 {
        route_link_list = xbt_dynar_new(sizeof(char *), NULL);
-       routing_add_route(source_id,destination_id,links_id,action);
+       //routing_add_route(source_id,destination_id,links_id,action); // COMMENTED BY DAVID
 
 }
 
@@ -1301,7 +1306,7 @@ void surf_route_set_resource(char *source_id,char *destination_id,xbt_dynar_t li
  */
 void surf_route_add_host(char *host_id)
 {
-       routing_add_host(host_id);
+       //routing_add_host(host_id); // COMMENTED BY DAVID
 }
 
 /*
@@ -1329,6 +1334,6 @@ void surf_wsL07_add_traces(void)
  */
 void surf_set_routes(void)
 {
-       routing_set_routes();
+       //routing_set_routes(); // COMMENTED BY DAVID
 }