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
Revert "Kill the <backbone> tag"
[simgrid.git]
/
src
/
surf
/
surf_routing.c
diff --git
a/src/surf/surf_routing.c
b/src/surf/surf_routing.c
index 8561b868b5f1a309b387a114d47c6791919ea69a..e4ce24ded5863c21d185452a276edc839ac6c1de 100644
(file)
--- a/
src/surf/surf_routing.c
+++ b/
src/surf/surf_routing.c
@@
-4,8
+4,6
@@
/* 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. */
/* 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 <pcre.h> /* regular expression library */
-
#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "surf_routing_private.h"
#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "surf_routing_private.h"
@@
-321,6
+319,8
@@
static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con
}
}
}
}
+extern int _sg_init_status; /* yay, this is an horrible hack */
+
/**
* \brief Make a new routing component to the platform
*
/**
* \brief Make a new routing component to the platform
*
@@
-344,6
+344,8
@@
void routing_AS_begin(sg_platf_AS_cbarg_t AS)
(as_router_lib, AS->id, ROUTING_ASR_LEVEL),
"The AS \"%s\" already exists", AS->id);
(as_router_lib, AS->id, ROUTING_ASR_LEVEL),
"The AS \"%s\" already exists", AS->id);
+ _sg_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
+
/* search the routing model */
switch(AS->routing){
case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
/* search the routing model */
switch(AS->routing){
case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
@@
-1017,7
+1019,7
@@
static void routing_parse_Srandom(void)
char *rd_name = NULL;
char *rd_value;
mean = surf_parse_get_double(A_surfxml_random_mean);
char *rd_name = NULL;
char *rd_value;
mean = surf_parse_get_double(A_surfxml_random_mean);
- std = surf_parse_get_double(A_surfxml_random_std_deviation);
+ std = surf_parse_get_double(A_surfxml_random_std_
__
deviation);
min = surf_parse_get_double(A_surfxml_random_min);
max = surf_parse_get_double(A_surfxml_random_max);
seed = surf_parse_get_double(A_surfxml_random_seed);
min = surf_parse_get_double(A_surfxml_random_min);
max = surf_parse_get_double(A_surfxml_random_max);
seed = surf_parse_get_double(A_surfxml_random_seed);