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
gosh, this shitty code is even dupplicated!
[simgrid.git]
/
src
/
surf
/
surfxml_parse.cpp
diff --git
a/src/surf/surfxml_parse.cpp
b/src/surf/surfxml_parse.cpp
index
da1c63d
..
59e99e8
100644
(file)
--- a/
src/surf/surfxml_parse.cpp
+++ b/
src/surf/surfxml_parse.cpp
@@
-15,7
+15,6
@@
#include "xbt/dict.h"
#include "src/surf/surf_private.h"
#include "simgrid/sg_config.h"
#include "xbt/dict.h"
#include "src/surf/surf_private.h"
#include "simgrid/sg_config.h"
-#include "surfxml_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
"Logging specific to the SURF parsing module");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
"Logging specific to the SURF parsing module");
@@
-55,7
+54,6
@@
double surf_parse_get_double(const char *string) {
int ret = sscanf(string, "%lg", &res);
if (ret != 1)
surf_parse_error("%s is not a double", string);
int ret = sscanf(string, "%lg", &res);
if (ret != 1)
surf_parse_error("%s is not a double", string);
- //printf("Parsed double [%g] %s\n", res, string);
return res;
}
return res;
}
@@
-508,7
+506,7
@@
void STag_surfxml_host___link(void){
host_link.id = A_surfxml_host___link_id;
host_link.link_up = A_surfxml_host___link_up;
host_link.link_down = A_surfxml_host___link_down;
host_link.id = A_surfxml_host___link_id;
host_link.link_up = A_surfxml_host___link_up;
host_link.link_down = A_surfxml_host___link_down;
- sg_platf_new_
netcard
(&host_link);
+ sg_platf_new_
hostlink
(&host_link);
}
void STag_surfxml_router(void){
}
void STag_surfxml_router(void){
@@
-813,7
+811,7
@@
void ETag_surfxml_ASroute(void){
break;
}
break;
}
- sg_platf_new_
AS
route(&ASroute);
+ sg_platf_new_route(&ASroute);
parsed_link_list = NULL;
}
parsed_link_list = NULL;
}
@@
-844,7
+842,7
@@
void ETag_surfxml_bypassASroute(void){
ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src);
ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src);
ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
- sg_platf_new_bypass
ASr
oute(&ASroute);
+ sg_platf_new_bypass
R
oute(&ASroute);
parsed_link_list = NULL;
}
parsed_link_list = NULL;
}