- name = xbt_strdup(surf_parse_text);
-
- surf_parse_float(&bw_initial);
- surf_parse_trace(&bw_trace);
- surf_parse_float(&lat_initial);
- surf_parse_trace(&lat_trace);
-
- token = surf_parse(); /* state_initial */
- xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos);
- if (strcmp(surf_parse_text, "ON") == 0)
- state_initial = SURF_NETWORK_LINK_ON;
- else if (strcmp(surf_parse_text, "OFF") == 0)
- state_initial = SURF_NETWORK_LINK_OFF;
- else {
- CRITICAL2("Invalid cpu state (line %d): %s neq ON or OFF\n", line_pos,
- surf_parse_text);
- xbt_abort();
- }
-
- surf_parse_trace(&state_trace);
-
- network_link_new(name, bw_initial, bw_trace,
- lat_initial, lat_trace,
- state_initial, state_trace);
-}
-
-/*
- Semantic: source destination network
- links
-
- Token: TOKEN_WORD TOKEN_WORD TOKEN_LP TOKEN_WORD* TOKEN_RP
- Type: string string string
-*/
-static void parse_route(int fake)
-{
- int src_id = -1;
- int dst_id = -1;
- int nb_link = 0;
- char **link_name = NULL;
- e_surf_token_t token;
-
- src_id = network_card_new(surf_parse_text);
-
- token = surf_parse();
- xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos);
- dst_id = network_card_new(surf_parse_text);
-
- token = surf_parse();
- xbt_assert1((token == TOKEN_LP), "Parse error line %d", line_pos);
-
- while((token = surf_parse())==TOKEN_WORD) {
- if(!fake) {
- nb_link++;
- link_name=xbt_realloc(link_name, (nb_link) * sizeof(char*));
- link_name[(nb_link)-1]=xbt_strdup(surf_parse_text);
- }
- }
- xbt_assert1((token == TOKEN_RP), "Parse error line %d", line_pos);
+ 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);
+
+ link_new(name_link, bw_initial, bw_trace,
+ lat_initial, lat_trace, state_initial_link, state_trace,
+ policy_initial_link, xbt_dict_new());