X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aee6610d4ad2377964369760bce27e18a12dd708..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/s4u/s4u_Netzone.cpp diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index e62b0afcde..da67bc6aed 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -40,7 +40,7 @@ NetZone::~NetZone() std::unordered_map* NetZone::getProperties() { - return simgrid::simix::kernelImmediate([this] { return &properties_; }); + return simgrid::simix::simcall([this] { return &properties_; }); } /** Retrieve the property value (or nullptr if not set) */ @@ -50,7 +50,7 @@ const char* NetZone::getProperty(const char* key) } void NetZone::setProperty(const char* key, const char* value) { - simgrid::simix::kernelImmediate([this, key, value] { properties_[key] = value; }); + simgrid::simix::simcall([this, key, value] { properties_[key] = value; }); } /** @brief Returns the list of direct children (no grand-children) @@ -111,7 +111,7 @@ void NetZone::add_route(kernel::routing::NetPoint* /*src*/, kernel::routing::Net sg_netzone_t sg_zone_get_root() { - return simgrid::s4u::Engine::getInstance()->getNetRoot(); + return simgrid::s4u::Engine::get_instance()->get_netzone_root(); } const char* sg_zone_get_name(sg_netzone_t netzone) @@ -121,7 +121,7 @@ const char* sg_zone_get_name(sg_netzone_t netzone) sg_netzone_t sg_zone_get_by_name(const char* name) { - return simgrid::s4u::Engine::getInstance()->getNetzoneByNameOrNull(name); + return simgrid::s4u::Engine::get_instance()->netzone_by_name_or_null(name); } void sg_zone_get_sons(sg_netzone_t netzone, xbt_dict_t whereto)