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

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

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 342fae9..83cef7c 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -59,7 +59,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 *), &free_string);
 }
 
 static void parse_route_set_route(void)
@@ -83,9 +82,7 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
   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(STag_surfxml_set_cb_list, &parse_sets);
   surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
   surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
@@ -199,7 +196,7 @@ static void update_actions_state(double now, double delta)
 
 static void update_resource_state(void *id,
                                  tmgr_trace_event_t event_type,
-                                 double value)
+                                 double value, double time)
 {
   DIE_IMPOSSIBLE;
 }
@@ -387,7 +384,7 @@ static void surf_network_model_init_internal(void)
   network_card_set = xbt_dict_new();
 
   if(!random_latency) 
-    random_latency = random_new(RAND, 0.0, 1.0, .125, .034);
+    random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
 }
 
 void surf_network_model_init_Constant(const char *filename)
@@ -400,7 +397,6 @@ void surf_network_model_init_Constant(const char *filename)
   xbt_dynar_push(model_list, &surf_network_model);
 
   update_model_description(surf_network_model_description,
-                             surf_network_model_description_size,
-                             "Constant",
-                             (surf_model_t) surf_network_model);
+                          "Constant",
+                          (surf_model_t) surf_network_model);
 }