node_data->y = 0;
node_data->degree = 0;
node_data->kind = ROUTER;
+ node_data->connect_checked = FALSE;
xbt_graph_new_node(platform_graph, (void*) node_data);
}
dynar_nodes = xbt_graph_get_nodes(platform_graph);
xbt_dynar_foreach(dynar_nodes, i, first_node) {
xbt_dynar_foreach(dynar_nodes, j, second_node) {
+ if(j>=i)
+ break;
platf_node_connect(first_node, second_node);
}
}
xbt_dynar_t connected_nodes = NULL;
xbt_dynar_t outgoing_edges = NULL;
xbt_node_t graph_node = NULL;
+ context_node_t node_data = NULL;
xbt_edge_t outedge = NULL;
unsigned long iterator;
unsigned int i;
dynar_nodes = xbt_graph_get_nodes(platform_graph);
connected_nodes = xbt_dynar_new(sizeof(xbt_node_t), NULL);
+ //Let's just check if every nodes are connected to something
+ xbt_dynar_foreach(dynar_nodes, i, graph_node) {
+ node_data = xbt_graph_node_get_data(graph_node);
+ if(node_data->degree==0) {
+ return FALSE;
+ }
+ }
+
+ //We still need a real check
//Initialize the connected node array with the first node
xbt_dynar_get_cpy(dynar_nodes, 0, &graph_node);
+ node_data = xbt_graph_node_get_data(graph_node);
+ node_data->connect_checked = TRUE;
xbt_dynar_push(connected_nodes, &graph_node);
iterator = 0;
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);
xbt_dynar_foreach(outgoing_edges, i, outedge) {
xbt_node_t src = xbt_graph_edge_get_source(outedge);
xbt_node_t dst = xbt_graph_edge_get_target(outedge);
- if(!xbt_dynar_member(connected_nodes, &src)) {
+ node_data = xbt_graph_node_get_data(src);
+ if(!node_data->connect_checked) {
xbt_dynar_push(connected_nodes, &src);
+ node_data->connect_checked = TRUE;
}
- if(!xbt_dynar_member(connected_nodes, &dst)) {
+ node_data = xbt_graph_node_get_data(dst);
+ if(!node_data->connect_checked) {
xbt_dynar_push(connected_nodes, &dst);
+ node_data->connect_checked = TRUE;
}
}
} while(++iterator < xbt_dynar_length(connected_nodes));
void platf_graph_clear_links(void) {
xbt_dynar_t dynar_nodes = NULL;
xbt_dynar_t dynar_edges = NULL;
+ xbt_dynar_t dynar_edges_cpy = NULL;
xbt_node_t graph_node = NULL;
xbt_edge_t graph_edge = NULL;
context_node_t node_data = NULL;
unsigned int i;
- //Delete edges from the graph
+ //The graph edge dynar will be modified directly, so we work on a copy of it
dynar_edges = xbt_graph_get_edges(platform_graph);
+ dynar_edges_cpy = xbt_dynar_new(sizeof(xbt_edge_t), NULL);
xbt_dynar_foreach(dynar_edges, i, graph_edge) {
+ xbt_dynar_push_as(dynar_edges_cpy, xbt_edge_t, graph_edge);
+ }
+ //Delete edges from the graph
+ xbt_dynar_foreach(dynar_edges_cpy, i, graph_edge) {
xbt_graph_free_edge(platform_graph, graph_edge, xbt_free);
}
+ //remove the dynar copy
+ xbt_dynar_free(&dynar_edges_cpy);
- //All the nodes will be of degree 0
+ //All the nodes will be of degree 0, unchecked from connectedness
dynar_nodes = xbt_graph_get_nodes(platform_graph);
xbt_dynar_foreach(dynar_nodes, i, graph_node) {
node_data = xbt_graph_node_get_data(graph_node);
node_data->degree = 0;
+ node_data->connect_checked = FALSE;
}
}
xbt_dynar_t nodes = NULL;
xbt_node_t graph_node = NULL;
context_node_t node_data = NULL;
+ xbt_dynar_t edges = NULL;
+ xbt_edge_t graph_edge = NULL;
+ context_edge_t edge_data = NULL;
unsigned int i;
unsigned int last_host = 0;
unsigned int last_cluster = 0;
sg_platf_host_cbarg_t host_parameters;
- s_sg_platf_router_cbarg_t router_parameters; /* This one is not a pointer! */
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! */
router_parameters.coord = NULL;
+ route_parameters.symmetrical = FALSE;
+ route_parameters.src = NULL;
+ route_parameters.dst = NULL;
+ route_parameters.gw_dst = NULL;
+ route_parameters.gw_src = NULL;
+ route_parameters.link_list = NULL;
nodes = xbt_graph_get_nodes(platform_graph);
+ edges = xbt_graph_get_edges(platform_graph);
sg_platf_begin();
surf_parse_init_callbacks();
routing_register_callbacks();
+ 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);
- sg_platf_new_AS_begin("random platform", A_surfxml_AS_routing_Floyd);
-
+ //Generate hosts, clusters and routers
xbt_dynar_foreach(nodes, i, graph_node) {
node_data = xbt_graph_node_get_data(graph_node);
switch(node_data->kind) {
sg_platf_new_cluster(cluster_parameters);
break;
case ROUTER:
- router_parameters.id = bprintf("router-%d", ++last_router);
+ node_data->router_id = bprintf("router-%d", ++last_router);
+ router_parameters.id = node_data->router_id;
sg_platf_new_router(&router_parameters);
}
}
+ //Generate links and routes
+ xbt_dynar_foreach(edges, i, graph_edge) {
+ xbt_node_t src = xbt_graph_edge_get_source(graph_edge);
+ xbt_node_t dst = xbt_graph_edge_get_target(graph_edge);
+ context_node_t src_data = xbt_graph_node_get_data(src);
+ context_node_t dst_data = xbt_graph_node_get_data(dst);
+ edge_data = xbt_graph_edge_get_data(graph_edge);
+ const char* temp = NULL;
+
+ //Add a link to the platform
+ link_parameters = &edge_data->link_parameters;
+ if(link_parameters->id == NULL) {
+ link_parameters->id = bprintf("link-%ld", edge_data->id);
+ }
+ sg_platf_new_link(link_parameters);
+
+ //Add a route matching this link
+ switch(src_data->kind) {
+ case ROUTER:
+ route_parameters.src = src_data->router_id;
+ break;
+ case CLUSTER:
+ route_parameters.src = src_data->cluster_parameters.id;
+ break;
+ case HOST:
+ route_parameters.src = src_data->host_parameters.id;
+ }
+ switch(dst_data->kind) {
+ case ROUTER:
+ route_parameters.dst = dst_data->router_id;
+ break;
+ case CLUSTER:
+ route_parameters.dst = dst_data->cluster_parameters.id;
+ break;
+ case HOST:
+ route_parameters.dst = dst_data->host_parameters.id;
+ }
+ sg_platf_route_begin(&route_parameters);
+ sg_platf_route_add_link(link_parameters->id, &route_parameters);
+ sg_platf_route_end(&route_parameters);
+
+ //Create the symmertical route
+ temp = route_parameters.dst;
+ route_parameters.dst = route_parameters.src;
+ route_parameters.src = temp;
+ sg_platf_route_begin(&route_parameters);
+ sg_platf_route_add_link(link_parameters->id, &route_parameters);
+ sg_platf_route_end(&route_parameters);
+ }
sg_platf_new_AS_end();
sg_platf_end();
