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
Constructor priorities are still not supported on Apple.
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
86cd770
..
cff7f9e
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-80,11
+80,11
@@
void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args)
/* Change from the defaults */
if (args->state_trace)
/* Change from the defaults */
if (args->state_trace)
- host->pimpl_cpu->set
StateT
race(args->state_trace);
+ host->pimpl_cpu->set
_state_t
race(args->state_trace);
if (args->speed_trace)
host->pimpl_cpu->set_speed_trace(args->speed_trace);
if (args->pstate != 0)
if (args->speed_trace)
host->pimpl_cpu->set_speed_trace(args->speed_trace);
if (args->pstate != 0)
- host->pimpl_cpu->set
PS
tate(args->pstate);
+ host->pimpl_cpu->set
_ps
tate(args->pstate);
if (args->coord && strcmp(args->coord, ""))
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
}
if (args->coord && strcmp(args->coord, ""))
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
}
@@
-96,7
+96,7
@@
simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base;
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base;
- xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->
getNetpointByNameOrN
ull(name),
+ xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->
netpoint_by_name_or_n
ull(name),
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
simgrid::kernel::routing::NetPoint* netpoint =
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
simgrid::kernel::routing::NetPoint* netpoint =
@@
-126,7
+126,7
@@
void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
if (link->properties) {
for (auto const& elm : *link->properties)
if (link->properties) {
for (auto const& elm : *link->properties)
- l->set
P
roperty(elm.first, elm.second);
+ l->set
_p
roperty(elm.first, elm.second);
}
if (link->latency_trace)
}
if (link->latency_trace)
@@
-363,7
+363,7
@@
void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage
if (storage->properties) {
for (auto const& elm : *storage->properties)
if (storage->properties) {
for (auto const& elm : *storage->properties)
- s->set
P
roperty(elm.first, elm.second);
+ s->set
_p
roperty(elm.first, elm.second);
delete storage->properties;
}
}
delete storage->properties;
}
}
@@
-487,7
+487,7
@@
void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer)
/* Change from the defaults */
if (peer->state_trace)
/* Change from the defaults */
if (peer->state_trace)
- host->pimpl_cpu->set
StateT
race(peer->state_trace);
+ host->pimpl_cpu->set
_state_t
race(peer->state_trace);
if (peer->speed_trace)
host->pimpl_cpu->set_speed_trace(peer->speed_trace);
}
if (peer->speed_trace)
host->pimpl_cpu->set_speed_trace(peer->speed_trace);
}
@@
-599,10
+599,7
@@
simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre
}
if (current_routing == nullptr) { /* it is the first one */
}
if (current_routing == nullptr) { /* it is the first one */
- xbt_assert(simgrid::s4u::Engine::get_instance()->pimpl->netzone_root_ == nullptr,
- "All defined components must belong to a networking zone.");
- simgrid::s4u::Engine::get_instance()->pimpl->netzone_root_ = new_zone;
-
+ simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone);
} else {
/* set the father behavior */
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
} else {
/* set the father behavior */
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)