A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing proto for PID functions
[simgrid.git]
/
src
/
surf
/
platf_generator.c
diff --git
a/src/surf/platf_generator.c
b/src/surf/platf_generator.c
index
db59a92
..
63e816e
100644
(file)
--- a/
src/surf/platf_generator.c
+++ b/
src/surf/platf_generator.c
@@
-430,16
+430,24
@@
int platf_graph_is_connected(void) {
void platf_graph_clear_links(void) {
xbt_dynar_t dynar_nodes = NULL;
xbt_dynar_t dynar_edges = NULL;
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;
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 = 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_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);
}
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, unchecked from connectedness
dynar_nodes = xbt_graph_get_nodes(platform_graph);
//All the nodes will be of degree 0, unchecked from connectedness
dynar_nodes = xbt_graph_get_nodes(platform_graph);
@@
-623,8
+631,10
@@
void platf_generate(void) {
surf_parse_init_callbacks();
routing_register_callbacks();
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) {
//Generate hosts, clusters and routers
xbt_dynar_foreach(nodes, i, graph_node) {