Fix typos [Arnaud Giersch]

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 8691238..aa49b3c 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -24,6 +24,37 @@ xbt_dict_t trace_connect_list_link_avail = NULL;
 xbt_dict_t trace_connect_list_bandwidth = NULL;
 xbt_dict_t trace_connect_list_latency = NULL;
 
+/* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the foreach tag */
+static xbt_dynar_t surfxml_bufferstack_stack = NULL;
+int surfxml_bufferstack_size = 2048;
+
+static char *old_buff = NULL;
+static void surf_parse_error(char *msg);
+
+unsigned int surfxml_buffer_stack_stack_ptr;
+unsigned int surfxml_buffer_stack_stack[1024];
+
+
+void surfxml_bufferstack_push(int new)
+{
+  if (!new)
+    old_buff = surfxml_bufferstack;
+  else {
+    xbt_dynar_push(surfxml_bufferstack_stack, &surfxml_bufferstack);
+    surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
+  }
+}
+
+void surfxml_bufferstack_pop(int new)
+{
+  if (!new)
+    surfxml_bufferstack = old_buff;
+  else {
+    free(surfxml_bufferstack);
+    xbt_dynar_pop(surfxml_bufferstack_stack, &surfxml_bufferstack);
+  }
+}
+
 /* make sure these symbols are defined as strong ones in this file so that the linked can resolve them */
 xbt_dynar_t STag_surfxml_platform_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_platform_cb_list = NULL;
@@ -43,6 +74,8 @@ xbt_dynar_t STag_surfxml_argument_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_argument_cb_list = NULL;
 xbt_dynar_t STag_surfxml_prop_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_prop_cb_list = NULL;
+xbt_dynar_t STag_surfxml_cluster_cb_list = NULL;
+xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL;
 xbt_dynar_t STag_surfxml_trace_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_trace_cb_list = NULL;
 xbt_dynar_t STag_surfxml_trace_c_connect_cb_list = NULL;
@@ -107,6 +140,8 @@ void surf_parse_free_callbacks(void)
   xbt_dynar_free(&ETag_surfxml_ASroute_cb_list);
   xbt_dynar_free(&STag_surfxml_bypassRoute_cb_list);
   xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list);
+  xbt_dynar_free(&STag_surfxml_cluster_cb_list);
+  xbt_dynar_free(&ETag_surfxml_cluster_cb_list);
 }
 
 void surf_parse_reset_parser(void)
@@ -142,6 +177,8 @@ void surf_parse_reset_parser(void)
   ETag_surfxml_ASroute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_bypassRoute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_bypassRoute_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 and Etag parse functions */
@@ -193,6 +230,7 @@ parse_method(S,random);           parse_method(E,random);
 parse_method(S,AS);               parse_method(E,AS);
 parse_method(S,ASroute);          parse_method(E,ASroute);
 parse_method(S,bypassRoute);      parse_method(E,bypassRoute);
+parse_method(S,cluster);         parse_method(E,cluster);
 
 /* Open and Close parse file */
 
@@ -286,6 +324,9 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list)
 
 static void init_data(void)
 {
+  if (!surfxml_bufferstack_stack)
+    surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL);
+
   random_data_list = xbt_dict_new();
   traces_set_list = xbt_dict_new();
   trace_connect_list_host_avail = xbt_dict_new();
@@ -311,6 +352,7 @@ static void free_data(void)
   xbt_dict_free(&trace_connect_list_latency);
   xbt_dict_free(&traces_set_list);
   xbt_dict_free(&random_data_list);
+  xbt_dynar_free(&surfxml_bufferstack_stack);
 }
 
 /* Here start parse */
@@ -318,6 +360,10 @@ static void free_data(void)
 void parse_platform_file(const char *file)
 {
   int parse_status;
+
+  surfxml_buffer_stack_stack_ptr = 1;
+  surfxml_buffer_stack_stack[0] = 0;
+
   surf_parse_open(file);
   init_data();
   parse_status = surf_parse();
@@ -448,7 +494,7 @@ static void add_randomness(void)
 {
   /* If needed aditional properties can be added by using the prop tag */
   random_data_t random = random_new(random_generator, 0, random_min, random_max, random_mean, random_std_deviation);
-  xbt_dict_set(random_data_list, random_id, (void *) random, &xbt_free_ref); // FIX BY DAVID, add the xbt_free_ref function
+  xbt_dict_set(random_data_list, random_id, (void *) random, &xbt_free_ref);
 }
 
 /**
@@ -525,7 +571,7 @@ void surf_wsL07_link_create_resource(char *name,
 
 void surf_add_route_element(char* link_ctn_id)
 {
-       xbt_die("\"surf_add_route_element\" not support");
+       xbt_die("\"surf_add_route_element\" not supported");
 //     char *val;
 //     val = xbt_strdup(link_ctn_id);
 //     xbt_dynar_push(route_link_list,&val);
@@ -535,9 +581,9 @@ 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)
 {
-       xbt_die("\"surf_route_set_resource\" not support");
-       //route_link_list = xbt_dynar_new(sizeof(char *), NULL); // COMMENTED BY DAVID
-       //routing_add_route(source_id,destination_id,links_id,action); // COMMENTED BY DAVID
+       xbt_die("\"surf_route_set_resource\" not supported");
+       //route_link_list = xbt_dynar_new(sizeof(char *), NULL);
+       //routing_add_route(source_id,destination_id,links_id,action);
 
 }
 
@@ -546,8 +592,8 @@ void surf_route_set_resource(char *source_id,char *destination_id,xbt_dynar_t li
  */
 void surf_route_add_host(char *host_id)
 {
-       xbt_die("\"surf_route_add_host\" not support");
-       //routing_add_host(host_id); // COMMENTED BY DAVID
+       xbt_die("\"surf_route_add_host\" not supported");
+       //routing_add_host(host_id);
 }
 
 /**
@@ -573,6 +619,6 @@ void surf_wsL07_add_traces(void)
  */
 void surf_set_routes(void)
 {
-       xbt_die("\"surf_set_routes\" not support");
-       //routing_set_routes(); // COMMENTED BY DAVID
-}
\ No newline at end of file
+       xbt_die("\"surf_set_routes\" not supported");
+       //routing_set_routes();
+}