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
do not search the cluster backbones again and again, store them in the right location
[simgrid.git]
/
src
/
surf
/
surfxml_parse.c
diff --git
a/src/surf/surfxml_parse.c
b/src/surf/surfxml_parse.c
index
7a7383c
..
10c9ff0
100644
(file)
--- a/
src/surf/surfxml_parse.c
+++ b/
src/surf/surfxml_parse.c
@@
-21,7
+21,7
@@
int ETag_surfxml_include_state(void);
/*
* Helping functions
*/
/*
* Helping functions
*/
-void surf_parse_error(char *msg) {
+void surf_parse_error(c
onst c
har *msg) {
xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg);
}
xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg);
}
@@
-86,10
+86,6
@@
static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t);
YY_BUFFER_STATE surf_input_buffer;
FILE *surf_file_to_parse = NULL;
YY_BUFFER_STATE surf_input_buffer;
FILE *surf_file_to_parse = NULL;
-static void parse_Stag_trace(void);
-static void parse_Etag_trace(void);
-static void parse_Stag_trace_connect(void);
-
static void init_randomness(void);
static void add_randomness(void);
static void init_randomness(void);
static void add_randomness(void);
@@
-258,10
+254,10
@@
void STag_surfxml_platform(void) {
"This program is installed automatically with SimGrid, or "
"available in the tools/ directory of the source archive.");
"This program is installed automatically with SimGrid, or "
"available in the tools/ directory of the source archive.");
- sg_platf_
ope
n();
+ sg_platf_
begi
n();
}
void ETag_surfxml_platform(void){
}
void ETag_surfxml_platform(void){
- sg_platf_
close
();
+ sg_platf_
end
();
}
void STag_surfxml_host(void){
}
void STag_surfxml_host(void){
@@
-331,7
+327,7
@@
void ETag_surfxml_cluster(void){
}
void STag_surfxml_peer(void){
}
void STag_surfxml_peer(void){
- s_s
urf_parsing_peer_
arg_t peer;
+ s_s
g_platf_peer_cb
arg_t peer;
memset(&peer,0,sizeof(peer));
peer.id = A_surfxml_peer_id;
peer.power = surf_parse_get_double(A_surfxml_peer_power);
memset(&peer,0,sizeof(peer));
peer.id = A_surfxml_peer_id;
peer.power = surf_parse_get_double(A_surfxml_peer_power);
@@
-415,10
+411,10
@@
void STag_surfxml_trace_connect(void){
surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
}
void STag_surfxml_AS(void){
surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
}
void STag_surfxml_AS(void){
- sg_platf_new_AS_
ope
n(A_surfxml_AS_id,A_surfxml_AS_routing);
+ sg_platf_new_AS_
begi
n(A_surfxml_AS_id,A_surfxml_AS_routing);
}
void ETag_surfxml_AS(void){
}
void ETag_surfxml_AS(void){
- sg_platf_new_AS_
close
();
+ sg_platf_new_AS_
end
();
}
void STag_surfxml_ASroute(void){
surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
}
void STag_surfxml_ASroute(void){
surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
@@
-495,10
+491,8
@@
void surf_parse_open(const char *file)
void surf_parse_close(void)
{
void surf_parse_close(void)
{
- if (surf_input_buffer_stack)
- xbt_dynar_free(&surf_input_buffer_stack);
- if (surf_file_to_parse_stack)
- xbt_dynar_free(&surf_file_to_parse_stack);
+ xbt_dynar_free(&surf_input_buffer_stack);
+ xbt_dynar_free(&surf_file_to_parse_stack);
if (surf_file_to_parse) {
surf_parse__delete_buffer(surf_input_buffer);
if (surf_file_to_parse) {
surf_parse__delete_buffer(surf_input_buffer);