if (!card) {
card = xbt_new0(s_network_card_CM02_t, 1);
card->name = xbt_strdup(card_name);
- card->id = card_number++;
+ card->id = host_number++;
xbt_dict_set(network_card_set, card_name, card, network_card_free);
}
return card->id;
src_id = network_card_new(A_surfxml_route_src);
dst_id = network_card_new(A_surfxml_route_dst);
route_action = A_surfxml_route_action;
- route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
+ route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
static void parse_route_set_route(void)
src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
+ xbt_dynar_free(&keys);
xbt_dynar_foreach (links, cpt, link) {
TRY {
surf_network_model = NULL;
loopback = NULL;
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
+ for (i = 0; i < host_number; i++)
+ for (j = 0; j < host_number; j++)
free(ROUTE(i, j));
free(routing_table);
routing_table = NULL;
free(routing_table_size);
routing_table_size = NULL;
- card_number = 0;
+ host_number = 0;
}
static void surf_network_model_init_internal(void)