- name = xbt_strdup(A_surfxml_network_link_name);
- surf_parse_get_double(&bw_initial, A_surfxml_network_link_bandwidth);
- surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
- surf_parse_get_double(&lat_initial, A_surfxml_network_link_latency);
- surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
-
- xbt_assert0((A_surfxml_network_link_state ==
- A_surfxml_network_link_state_ON)
- || (A_surfxml_network_link_state ==
- A_surfxml_network_link_state_OFF), "Invalid state");
- if (A_surfxml_network_link_state == A_surfxml_network_link_state_ON)
- state_initial = SURF_NETWORK_LINK_ON;
- else if (A_surfxml_network_link_state ==
- A_surfxml_network_link_state_OFF)
- state_initial = SURF_NETWORK_LINK_OFF;
-
- if (A_surfxml_network_link_sharing_policy ==
- A_surfxml_network_link_sharing_policy_SHARED)
- policy_initial = SURF_NETWORK_LINK_SHARED;
- else if (A_surfxml_network_link_sharing_policy ==
- A_surfxml_network_link_sharing_policy_FATPIPE)
- policy_initial = SURF_NETWORK_LINK_FATPIPE;
-
- surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file);
-
- network_link_new(name, bw_initial, bw_trace, lat_initial, lat_trace,
- state_initial, state_trace, policy_initial);
-}
+ name_link = xbt_strdup(A_surfxml_link_id);
+ surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
+ surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file);
+ surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
+ surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file);
+
+ xbt_assert0((A_surfxml_link_state ==
+ A_surfxml_link_state_ON)
+ || (A_surfxml_link_state ==
+ A_surfxml_link_state_OFF), "Invalid state");
+ if (A_surfxml_link_state == A_surfxml_link_state_ON)
+ state_initial_link = SURF_LINK_ON;
+ else if (A_surfxml_link_state ==
+ A_surfxml_link_state_OFF)
+ state_initial_link = SURF_LINK_OFF;
+
+ if (A_surfxml_link_sharing_policy ==
+ A_surfxml_link_sharing_policy_SHARED)
+ policy_initial_link = SURF_LINK_SHARED;
+ else if (A_surfxml_link_sharing_policy ==
+ A_surfxml_link_sharing_policy_FATPIPE)
+ policy_initial_link = SURF_LINK_FATPIPE;
+
+ surf_parse_get_trace(&state_trace, A_surfxml_link_state_file);
+
+ current_property_set = xbt_dict_new();
+ link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace,
+ state_initial_link, state_trace, policy_initial_link, current_property_set);
+
+ }