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
mv link map to the engine
[simgrid.git]
/
src
/
surf
/
xml
/
surfxml_sax_cb.cpp
diff --git
a/src/surf/xml/surfxml_sax_cb.cpp
b/src/surf/xml/surfxml_sax_cb.cpp
index
be0c93d
..
d7d9c84
100644
(file)
--- a/
src/surf/xml/surfxml_sax_cb.cpp
+++ b/
src/surf/xml/surfxml_sax_cb.cpp
@@
-404,7
+404,7
@@
void STag_surfxml_prop()
{
if (ZONE_TAG) { // We need to retrieve the most recently opened zone
XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
- simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::get_instance()->
getNetzoneByNameOrN
ull(A_surfxml_zone_id);
+ simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::get_instance()->
netzone_by_name_or_n
ull(A_surfxml_zone_id);
netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value);
} else {
@@
-609,13
+609,13
@@
void STag_surfxml_link___ctn()
switch (A_surfxml_link___ctn_direction) {
case AU_surfxml_link___ctn_direction:
case A_surfxml_link___ctn_direction_NONE:
- link = simgrid::
kernel::resource::LinkImpl::byName(A_surfxml_link___ctn_id
);
+ link = simgrid::
s4u::Link::by_name(std::string(A_surfxml_link___ctn_id))->get_impl(
);
break;
case A_surfxml_link___ctn_direction_UP:
- link = simgrid::
kernel::resource::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_UP"
);
+ link = simgrid::
s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_UP")->get_impl(
);
break;
case A_surfxml_link___ctn_direction_DOWN:
- link = simgrid::
kernel::resource::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_DOWN"
);
+ link = simgrid::
s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_DOWN")->get_impl(
);
break;
default:
surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
@@
-647,7
+647,7
@@
void ETag_surfxml_backbone(){
link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
sg_platf_new_link(&link);
- routing_cluster_add_backbone(simgrid::
kernel::resource::LinkImpl::byName(A_surfxml_backbone_id
));
+ routing_cluster_add_backbone(simgrid::
s4u::Link::by_name(std::string(A_surfxml_backbone_id))->get_impl(
));
}
void STag_surfxml_route(){
@@
-960,7
+960,7
@@
void surf_parse_open(const char *file)
xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays.");
surf_parsed_filename = file;
- std::string dir = simgrid::xbt::Path(file).get
Dir
name();
+ std::string dir = simgrid::xbt::Path(file).get
_dir_
name();
surf_path.push_back(dir);
surf_file_to_parse = surf_fopen(file, "r");