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
Cleanup.
[simgrid.git]
/
src
/
surf
/
surfxml_parse.c
diff --git
a/src/surf/surfxml_parse.c
b/src/surf/surfxml_parse.c
index
785a41d
..
3136fdf
100644
(file)
--- a/
src/surf/surfxml_parse.c
+++ b/
src/surf/surfxml_parse.c
@@
-27,6
+27,8
@@
void_f_void_t *STag_surfxml_platform_description_fun = nil_function;
void_f_void_t *ETag_surfxml_platform_description_fun = nil_function;
void_f_void_t *STag_surfxml_cpu_fun = nil_function;
void_f_void_t *ETag_surfxml_cpu_fun = nil_function;
void_f_void_t *ETag_surfxml_platform_description_fun = nil_function;
void_f_void_t *STag_surfxml_cpu_fun = nil_function;
void_f_void_t *ETag_surfxml_cpu_fun = nil_function;
+void_f_void_t *STag_surfxml_router_fun = nil_function;
+void_f_void_t *ETag_surfxml_router_fun = nil_function;
void_f_void_t *STag_surfxml_network_link_fun = nil_function;
void_f_void_t *ETag_surfxml_network_link_fun = nil_function;
void_f_void_t *STag_surfxml_route_fun = nil_function;
void_f_void_t *STag_surfxml_network_link_fun = nil_function;
void_f_void_t *ETag_surfxml_network_link_fun = nil_function;
void_f_void_t *STag_surfxml_route_fun = nil_function;
@@
-47,6
+49,8
@@
void surf_parse_reset_parser(void)
ETag_surfxml_platform_description_fun = nil_function;
STag_surfxml_cpu_fun = nil_function;
ETag_surfxml_cpu_fun = nil_function;
ETag_surfxml_platform_description_fun = nil_function;
STag_surfxml_cpu_fun = nil_function;
ETag_surfxml_cpu_fun = nil_function;
+ STag_surfxml_router_fun = nil_function;
+ ETag_surfxml_router_fun = nil_function;
STag_surfxml_network_link_fun = nil_function;
ETag_surfxml_network_link_fun = nil_function;
STag_surfxml_route_fun = nil_function;
STag_surfxml_network_link_fun = nil_function;
ETag_surfxml_network_link_fun = nil_function;
STag_surfxml_route_fun = nil_function;
@@
-117,6
+121,16
@@
void ETag_surfxml_cpu(void)
ETag_surfxml_cpu_fun();
}
ETag_surfxml_cpu_fun();
}
+void STag_surfxml_router(void)
+{
+ STag_surfxml_router_fun();
+}
+
+void ETag_surfxml_router(void)
+{
+ ETag_surfxml_router_fun();
+}
+
void STag_surfxml_network_link(void)
{
STag_surfxml_network_link_fun();
void STag_surfxml_network_link(void)
{
STag_surfxml_network_link_fun();
@@
-168,8
+182,12
@@
void ETag_surfxml_argument(void)
}
void surf_parse_open(const char *file) {
}
void surf_parse_open(const char *file) {
+ static int warned = 0; /* warn only once */
if(!file) {
if(!file) {
- WARN0("I hope you know what you're doing... you just gave me a NULL pointer!");
+ if (!warned) {
+ WARN0("Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.");
+ warned = 1;
+ }
return;
}
if(!surf_input_buffer_stack)
return;
}
if(!surf_input_buffer_stack)