add function surf_add_route_element

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 7ff2efa..4d4bbb2 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -269,6 +269,7 @@ void ETag_surfxml_platform(void)
 void STag_surfxml_host(void)
 {
   surfxml_call_cb_functions(STag_surfxml_host_cb_list);
+
 }
 
 void ETag_surfxml_host(void)
@@ -463,7 +464,6 @@ void surf_parse_close(void)
   }
 }
 
-
 static int _surf_parse(void)
 {
   return surf_parse_lex();
@@ -697,6 +697,7 @@ static void parse_sets(void)
 }
 
 static void parse_host_foreach(void){
+
   xbt_dynar_t names = NULL;
   unsigned int cpt = 0;
   char *name;
@@ -877,7 +878,7 @@ void manage_route(xbt_dict_t routing_table, const char *route_name,
       xbt_dynar_free(&links);
       break;
     case A_surfxml_route_action_POSTPEND:      /* add existing links in front; links + route_link_list */
-      xbt_dynar_foreach(route_link_list, cpt, value) {
+       xbt_dynar_foreach(route_link_list, cpt, value) {
         xbt_dynar_push(links, &value);
       }
       xbt_dynar_free(&route_link_list);
@@ -891,6 +892,7 @@ void manage_route(xbt_dict_t routing_table, const char *route_name,
           route_name,action));
       break;
     }
+
   }
   /* this is the final route; do not add if name is a set; add only if name is in set list */
   if (!isMultiRoute) {
@@ -1164,3 +1166,34 @@ static void add_randomness(void)
                random_std_deviation);
   xbt_dict_set(random_data_list, random_id, (void *) random, NULL);
 }
+
+void surf_host_create_resource(char *name, double power_peak,
+        double power_scale,
+        tmgr_trace_t power_trace,
+        e_surf_resource_state_t state_initial,
+        tmgr_trace_t state_trace,
+        xbt_dict_t cpu_properties)
+{
+       return surf_cpu_model->extension.cpu.
+               create_resource(name,power_peak,power_scale,power_trace,state_initial,state_trace,cpu_properties);
+}
+
+
+void surf_link_create_resouce(char *name,
+        double bw_initial,
+        double lat_initial)
+{
+       return surf_network_model->extension.network.
+            create_resource(name,bw_initial,lat_initial);
+
+}
+
+/**
+ * Route: add route element bypassing the parser :
+ * same job as parse_route_elem
+ */
+
+void surf_add_route_element(char* link_ctn_id)
+{
+       xbt_dynar_push(route_link_list,&link_ctn_id);
+}