+/* 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"
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 {
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_graph_free_edge(platform_graph, graph_edge, xbt_free);
+ 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_f);
}
+ //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;
}
}
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) {
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);
+ 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);
