Factorize some code in the parser, hide some functions and variables, avoid useless...

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 3535d2b..6c2c6c1 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -15,7 +15,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
 surf_network_model_t surf_network_model = NULL;
 static lmm_system_t network_maxmin_system = NULL;
 static void (*network_solve) (lmm_system_t) = NULL;
-
 xbt_dict_t link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
@@ -162,7 +161,6 @@ static void parse_route_set_endpoints(void)
   src_id = network_card_new(A_surfxml_route_src);
   dst_id = network_card_new(A_surfxml_route_dst);
   route_action = A_surfxml_route_action;
-  route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
 static void parse_route_set_route(void)
@@ -229,9 +227,6 @@ static void add_route(void)
     }
     route_new(src_id, dst_id, link_list, nb_link);
    }
-
-   xbt_dict_free(&route_table);
-
 }
 
 static void count_hosts(void)
@@ -295,9 +290,7 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
   surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
   surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
-  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
   surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
-  surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
@@ -705,6 +698,8 @@ static void finalize(void)
   free(routing_table_size);
   routing_table_size = NULL;
   host_number = 0;
+  lmm_system_free(network_maxmin_system);
+  network_maxmin_system = NULL;
 }
 
 static void surf_network_model_init_internal(void)
@@ -802,9 +797,8 @@ void surf_network_model_init_CM02(const char *filename)
   network_solve = lmm_solve;
 
   update_model_description(surf_network_model_description,
-                             surf_network_model_description_size,
-                             "CM02",
-                             (surf_model_t) surf_network_model);
+                          "CM02",
+                          (surf_model_t) surf_network_model);
 }
 
 void surf_network_model_init_Reno(const char *filename)
@@ -820,9 +814,8 @@ void surf_network_model_init_Reno(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-                             surf_network_model_description_size,
-                             "Reno",
-                             (surf_model_t) surf_network_model);
+                          "Reno",
+                          (surf_model_t) surf_network_model);
 }
 
 
@@ -831,7 +824,7 @@ void surf_network_model_init_Reno2(const char *filename)
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
 
   xbt_dynar_push(model_list, &surf_network_model);
   lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
@@ -839,9 +832,8 @@ void surf_network_model_init_Reno2(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-                             surf_network_model_description_size,
-                             "Reno2",
-                             (surf_model_t) surf_network_model);
+                          "Reno2",
+                          (surf_model_t) surf_network_model);
 }
 
 void surf_network_model_init_Vegas(const char *filename)
@@ -857,9 +849,8 @@ void surf_network_model_init_Vegas(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-                             surf_network_model_description_size,
-                             "Vegas",
-                             (surf_model_t) surf_network_model);
+                          "Vegas",
+                          (surf_model_t) surf_network_model);
 }
 
 #ifdef HAVE_SDP
@@ -874,8 +865,22 @@ void surf_network_model_init_SDP(const char *filename)
   network_solve = sdp_solve;
 
   update_model_description(surf_network_model_description,
-                             surf_network_model_description_size,
-                             "SDP",
-                             (surf_model_t) surf_network_model);
+                          "SDP",
+                          (surf_model_t) surf_network_model);
+}
+#endif
+
+#ifdef HAVE_GTNETS
+void surf_network_model_init_GTNETS(const char *filename)
+{
+  if (surf_network_model)
+    return;
+  surf_network_model_init_internal();
+  define_callbacks(filename);
+  xbt_dynar_push(model_list, &surf_network_model);
+
+  update_model_description(surf_network_model_description,
+                          "GTNets",
+                          (surf_model_t) surf_network_model);
 }
 #endif