+/* Copyright (c) 2012, 2014-2015. The SimGrid Team.
+ * All rights reserved. */
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/platf_generator.h"
#include "platf_generator_private.h"
do {
//Get the next node
xbt_dynar_get_cpy(connected_nodes, iterator, &graph_node);
- node_data = xbt_graph_node_get_data(graph_node);
//add all the linked nodes to the connected node array
outgoing_edges = xbt_graph_node_get_outedges(graph_node);
}
//Delete edges from the graph
xbt_dynar_foreach(dynar_edges_cpy, i, graph_edge) {
- xbt_graph_free_edge(platform_graph, graph_edge, xbt_free);
+ xbt_graph_free_edge(platform_graph, graph_edge, xbt_free_f);
}
//remove the dynar copy
xbt_dynar_free(&dynar_edges_cpy);
sg_platf_host_cbarg_t host_parameters;
sg_platf_cluster_cbarg_t cluster_parameters;
sg_platf_link_cbarg_t link_parameters;
- s_sg_platf_router_cbarg_t router_parameters; /* This one is not a pointer! */
- s_sg_platf_route_cbarg_t route_parameters; /* neither this one! */
+ s_sg_platf_router_cbarg_t router_parameters = SG_PLATF_ROUTER_INITIALIZER; /* This one is not a pointer! */
+ s_sg_platf_route_cbarg_t route_parameters = SG_PLATF_ROUTE_INITIALIZER; /* neither this one! */
router_parameters.coord = NULL;
route_parameters.symmetrical = FALSE;
surf_parse_init_callbacks();
routing_register_callbacks();
-
- sg_platf_new_AS_begin("random platform", A_surfxml_AS_routing_Floyd);
+ s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+ AS.id = "random platform";
+ AS.routing = A_surfxml_AS_routing_Floyd;
+ sg_platf_new_AS_begin(&AS);
//Generate hosts, clusters and routers
xbt_dynar_foreach(nodes, i, graph_node) {
node_data->router_id = bprintf("router-%d", ++last_router);
router_parameters.id = node_data->router_id;
sg_platf_new_router(&router_parameters);
+ break;
}
}
break;
case HOST:
route_parameters.src = src_data->host_parameters.id;
+ break;
}
switch(dst_data->kind) {
case ROUTER:
break;
case HOST:
route_parameters.dst = dst_data->host_parameters.id;
+ break;
}
sg_platf_route_begin(&route_parameters);
sg_platf_route_add_link(link_parameters->id, &route_parameters);