merge conflicts resolved

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index b83d168..0187aa5 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -128,7 +128,7 @@ int ETag_surfxml_include_state(void)
 {
   fflush(NULL);
   XBT_INFO("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
-  if(xbt_dynar_length(surf_input_buffer_stack)!= 0)
+  if(!xbt_dynar_is_empty(surf_input_buffer_stack))
          return 1;
   fclose(surf_file_to_parse);
   xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse);
@@ -253,29 +253,30 @@ void ETag_surfxml_platform(void){
 }
 
 void STag_surfxml_host(void){
-  s_sg_platf_host_cbarg_t host;
-  memset(&host,0,sizeof(host));
-
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
-  host.properties = current_property_set = xbt_dict_new();
-
-       host.id = A_surfxml_host_id;
-       host.power_peak = get_cpu_power(A_surfxml_host_power);
-       host.power_scale = surf_parse_get_double( A_surfxml_host_availability);
-       host.core_amount = surf_parse_get_int(A_surfxml_host_core);
-       host.power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
-       host.state_trace = tmgr_trace_new(A_surfxml_host_state_file);
-       xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
-                         (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state");
-       if (A_surfxml_host_state == A_surfxml_host_state_ON)
-               host.initial_state = SURF_RESOURCE_ON;
-       if (A_surfxml_host_state == A_surfxml_host_state_OFF)
-               host.initial_state = SURF_RESOURCE_OFF;
-       host.coord = A_surfxml_host_coordinates;
-
-       sg_platf_new_host(&host);
 }
+
 void ETag_surfxml_host(void)    {
+  s_sg_platf_host_cbarg_t host;
+  memset(&host,0,sizeof(host));
+
+  host.properties = current_property_set;
+
+  host.id = A_surfxml_host_id;
+  host.power_peak = get_cpu_power(A_surfxml_host_power);
+  host.power_scale = surf_parse_get_double( A_surfxml_host_availability);
+  host.core_amount = surf_parse_get_int(A_surfxml_host_core);
+  host.power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
+  host.state_trace = tmgr_trace_new(A_surfxml_host_state_file);
+  xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+        (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state");
+  if (A_surfxml_host_state == A_surfxml_host_state_ON)
+    host.initial_state = SURF_RESOURCE_ON;
+  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
+    host.initial_state = SURF_RESOURCE_OFF;
+  host.coord = A_surfxml_host_coordinates;
+
+  sg_platf_new_host(&host);
   current_property_set = NULL;
 }
 
@@ -363,47 +364,50 @@ void ETag_surfxml_peer(void){
   /* nothing to do here */
 }
 void STag_surfxml_link(void){
-  s_sg_platf_link_cbarg_t link;
-  memset(&link,0,sizeof(link));
-
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
-  link.properties = current_property_set = xbt_dict_new();
-
-       link.id = A_surfxml_link_id;
-       link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth);
-       link.bandwidth_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
-       link.latency = surf_parse_get_double(A_surfxml_link_latency);
-       link.latency_trace = tmgr_trace_new(A_surfxml_link_latency_file);
-
-       switch (A_surfxml_link_state) {
-       case A_surfxml_link_state_ON:
-               link.state = SURF_RESOURCE_ON;
-               break;
-       case A_surfxml_link_state_OFF:
-               link.state = SURF_RESOURCE_OFF;
-               break;
-       default:
-         surf_parse_error(bprintf("invalid state for link %s",link.id));
-       }
-       link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
-
-       switch (A_surfxml_link_sharing_policy) {
-       case A_surfxml_link_sharing_policy_SHARED:
-               link.policy = SURF_LINK_SHARED;
-               break;
-       case A_surfxml_link_sharing_policy_FATPIPE:
-                link.policy = SURF_LINK_FATPIPE;
-                break;
-       case A_surfxml_link_sharing_policy_FULLDUPLEX:
-                link.policy = SURF_LINK_FULLDUPLEX;
-                break;
-       default:
-         surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id));
-       }
-
-       sg_platf_new_link(&link);
 }
 void ETag_surfxml_link(void){
+  s_sg_platf_link_cbarg_t link;
+  memset(&link,0,sizeof(link));
+
+  link.properties = current_property_set;
+
+  link.id = A_surfxml_link_id;
+  link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth);
+  link.bandwidth_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
+  link.latency = surf_parse_get_double(A_surfxml_link_latency);
+  link.latency_trace = tmgr_trace_new(A_surfxml_link_latency_file);
+
+  switch (A_surfxml_link_state) {
+  case A_surfxml_link_state_ON:
+    link.state = SURF_RESOURCE_ON;
+    break;
+  case A_surfxml_link_state_OFF:
+    link.state = SURF_RESOURCE_OFF;
+    break;
+  default:
+    surf_parse_error(bprintf("invalid state for link %s",link.id));
+    break;
+  }
+  link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
+
+  switch (A_surfxml_link_sharing_policy) {
+  case A_surfxml_link_sharing_policy_SHARED:
+    link.policy = SURF_LINK_SHARED;
+    break;
+  case A_surfxml_link_sharing_policy_FATPIPE:
+     link.policy = SURF_LINK_FATPIPE;
+     break;
+  case A_surfxml_link_sharing_policy_FULLDUPLEX:
+     link.policy = SURF_LINK_FULLDUPLEX;
+     break;
+  default:
+    surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id));
+    break;
+  }
+
+  sg_platf_new_link(&link);
+
   current_property_set = NULL;
 }
 
@@ -443,8 +447,6 @@ void STag_surfxml_bypassRoute(void){
 void STag_surfxml_config(void){
   XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
-  current_property_set = xbt_dict_new();
-
 }
 void ETag_surfxml_config(void){
   xbt_dict_cursor_t cursor = NULL;
@@ -566,31 +568,15 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list)
 
 /* Prop tag functions */
 
-void parse_properties(const char* prop_id, const char* prop_value)
-{
-       if (!current_property_set)
-           current_property_set = xbt_dict_new();      // Maybe, it should raise an error
-       if(!strcmp(prop_id,"coordinates")){
-               if(!strcmp(prop_value,"yes") && !COORD_HOST_LEVEL)
-                 {
-                           XBT_INFO("Configuration change: Set '%s' to '%s'", prop_id, prop_value);
-                               COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
-                               COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
-                 }
-               if(strcmp(A_surfxml_prop_value,"yes"))
-                         xbt_die("Setting XML prop coordinates must be \"yes\"");
-         }
-       else{
-                 xbt_dict_set(current_property_set, prop_id, xbt_strdup(prop_value), free);
-        }
-}
-
 /**
  * With XML parser
  */
-void parse_properties_XML(void)
+void parse_properties(void)
 {
-  parse_properties(A_surfxml_prop_id, A_surfxml_prop_value);
+  if (!current_property_set)
+    current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
+
+  xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL);
 }