model-checker : assert on block/fragment address in heap comparison algorithm

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index ac5d93b..2798ab1 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -128,6 +128,7 @@ void ETag_surfxml_storage(void)
 
   storage.id = A_surfxml_storage_id;
   storage.type_id = A_surfxml_storage_typeId;
+  storage.content = A_surfxml_storage_content;
   sg_platf_new_storage(&storage);
 }
 void STag_surfxml_storage_type(void)
@@ -144,6 +145,7 @@ void ETag_surfxml_storage_type(void)
   storage_type.id = A_surfxml_storage_type_id;
   storage_type.model = A_surfxml_storage_type_model;
   storage_type.properties = current_property_set;
+  storage_type.size = surf_parse_get_int(A_surfxml_storage_type_size);
   sg_platf_new_storage_type(&storage_type);
   current_property_set = NULL;
 }
@@ -592,20 +594,22 @@ void STag_surfxml_random(void){
        surfxml_call_cb_functions(STag_surfxml_random_cb_list);
 }
 
-#define parse_method(type,name) \
-void type##Tag_surfxml_##name(void) \
-{ surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); }
-parse_method(E, route)
-parse_method(E, link_ctn)
-parse_method(E, process)
-parse_method(E, argument)
-parse_method(E, prop)
-parse_method(E, trace)
-parse_method(E, trace_connect)
-parse_method(E, random)
-parse_method(E, ASroute)
-parse_method(E, bypassRoute)
-parse_method(E, bypassASroute)
+#define parse_method(type,name)                                         \
+  void type##Tag_surfxml_##name(void)                                   \
+  { surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); }    \
+  void type##Tag_surfxml_##name(void)
+
+parse_method(E, route);
+parse_method(E, link_ctn);
+parse_method(E, process);
+parse_method(E, argument);
+parse_method(E, prop);
+parse_method(E, trace);
+parse_method(E, trace_connect);
+parse_method(E, random);
+parse_method(E, ASroute);
+parse_method(E, bypassRoute);
+parse_method(E, bypassASroute);
 
 /* Open and Close parse file */