From: Martin Quinson Date: Mon, 30 Jan 2017 21:32:27 +0000 (+0100) Subject: netcards were renamed to netpoints recently X-Git-Tag: v3_15~503 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c1103c3a2b794d6f7e4599cf0182d72937b9a021?hp=5334f045cb30ca80b30ba732bfe116e789941a09 netcards were renamed to netpoints recently --- diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp index 3caf268250..9bdbba9021 100644 --- a/include/simgrid/s4u/engine.hpp +++ b/include/simgrid/s4u/engine.hpp @@ -73,10 +73,10 @@ public: simgrid::s4u::NetZone* netzoneByNameOrNull(const char* name); /** @brief Retrieve the netcard of the given name (or nullptr if not found) */ - simgrid::kernel::routing::NetPoint* netcardByNameOrNull(const char* name); - void netcardList(std::vector * list); - void netcardRegister(simgrid::kernel::routing::NetPoint * card); - void netcardUnregister(simgrid::kernel::routing::NetPoint * card); + simgrid::kernel::routing::NetPoint* netpointByNameOrNull(const char* name); + void netpointList(std::vector * list); + void netpointRegister(simgrid::kernel::routing::NetPoint * card); + void netpointUnregister(simgrid::kernel::routing::NetPoint * card); template void registerFunction(const char* name) diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 48d1af162d..f172f91a99 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -72,11 +72,11 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe xbt_assert(newContainer->netcard, "Element '%s' not found",name); break; case INSTR_ROUTER: - newContainer->netcard = simgrid::s4u::Engine::instance()->netcardByNameOrNull(name); + newContainer->netcard = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name); xbt_assert(newContainer->netcard, "Element '%s' not found",name); break; case INSTR_AS: - newContainer->netcard = simgrid::s4u::Engine::instance()->netcardByNameOrNull(name); + newContainer->netcard = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name); xbt_assert(newContainer->netcard, "Element '%s' not found",name); break; default: diff --git a/src/kernel/routing/NetPoint.cpp b/src/kernel/routing/NetPoint.cpp index 5bf404bfe0..49c517f780 100644 --- a/src/kernel/routing/NetPoint.cpp +++ b/src/kernel/routing/NetPoint.cpp @@ -23,7 +23,7 @@ NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* { if (netzone_p != nullptr) id_ = netzone_p->addComponent(this); - simgrid::s4u::Engine::instance()->netcardRegister(this); + simgrid::s4u::Engine::instance()->netpointRegister(this); simgrid::kernel::routing::NetPoint::onCreation(this); } } @@ -36,5 +36,5 @@ NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* */ simgrid::kernel::routing::NetPoint* sg_netcard_by_name_or_null(const char* name) { - return simgrid::s4u::Engine::instance()->netcardByNameOrNull(name); + return simgrid::s4u::Engine::instance()->netpointByNameOrNull(name); } diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 464e973735..b312eb36d0 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -28,7 +28,7 @@ public: NetZoneImpl::NetZoneImpl(NetZone* father, const char* name) : NetZone(father, name) { - xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netcardByNameOrNull(name), + xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name), "Refusing to create a second NetZone called '%s'.", name); netcard_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast(father)); @@ -39,7 +39,7 @@ NetZoneImpl::~NetZoneImpl() for (auto& kv : bypassRoutes_) delete kv.second; - simgrid::s4u::Engine::instance()->netcardUnregister(netcard_); + simgrid::s4u::Engine::instance()->netpointUnregister(netcard_); } simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector* speedPerPstate, int coreAmount, diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index 9c54ab7487..7832bed6b3 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -78,8 +78,8 @@ void VivaldiZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba if (src->isNetZone()) { std::string srcName = "router_" + src->name(); std::string dstName = "router_" + dst->name(); - route->gw_src = simgrid::s4u::Engine::instance()->netcardByNameOrNull(srcName.c_str()); - route->gw_dst = simgrid::s4u::Engine::instance()->netcardByNameOrNull(dstName.c_str()); + route->gw_src = simgrid::s4u::Engine::instance()->netpointByNameOrNull(srcName.c_str()); + route->gw_dst = simgrid::s4u::Engine::instance()->netpointByNameOrNull(dstName.c_str()); } /* Retrieve the private links */ diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp index 49844d197b..2980b68557 100644 --- a/src/s4u/s4u_engine.cpp +++ b/src/s4u/s4u_engine.cpp @@ -111,32 +111,32 @@ NetZone* Engine::netzoneByNameOrNull(const char* name) return netzoneByNameRecursive(netRoot(), name); } -/** @brief Retrieve the netcard of the given name (or nullptr if not found) */ -simgrid::kernel::routing::NetPoint* Engine::netcardByNameOrNull(const char* name) +/** @brief Retrieve the netpoint of the given name (or nullptr if not found) */ +simgrid::kernel::routing::NetPoint* Engine::netpointByNameOrNull(const char* name) { if (pimpl->netpoints_.find(name) == pimpl->netpoints_.end()) return nullptr; return pimpl->netpoints_.at(name); } -/** @brief Fill the provided vector with all existing netcards */ -void Engine::netcardList(std::vector* list) +/** @brief Fill the provided vector with all existing netpoints */ +void Engine::netpointList(std::vector* list) { for (auto kv : pimpl->netpoints_) list->push_back(kv.second); } -/** @brief Register a new netcard to the system */ -void Engine::netcardRegister(simgrid::kernel::routing::NetPoint* card) +/** @brief Register a new netpoint to the system */ +void Engine::netpointRegister(simgrid::kernel::routing::NetPoint* point) { // simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread -pimpl->netpoints_[card->name()] = card; + pimpl->netpoints_[point->name()] = point; // }); } -/** @brief Unregister a given netcard */ -void Engine::netcardUnregister(simgrid::kernel::routing::NetPoint* card) +/** @brief Unregister a given netpoint */ +void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point) { simgrid::simix::kernelImmediate([&] { - pimpl->netpoints_.erase(card->name()); - delete card; + pimpl->netpoints_.erase(point->name()); + delete point; }); } } diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index e602cebe6d..3e5c7e66c8 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -55,7 +55,7 @@ Host::~Host() delete pimpl_; if (pimpl_netpoint != nullptr) // not removed yet by a children class - simgrid::s4u::Engine::instance()->netcardUnregister(pimpl_netpoint); + simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint); delete pimpl_cpu; delete mounts; } diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 3dff876900..58fbe8cb69 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -102,7 +102,7 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const 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::instance()->netcardByNameOrNull(name), + xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name), "Refusing to create a router named '%s': this name already describes a node.", name); simgrid::kernel::routing::NetPoint* netcard = diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index 5fbf34cff9..ffa3c588fe 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -88,7 +88,7 @@ int main(int argc, char **argv) create_environment(parse_time, platformFile); std::vector netcardList; - simgrid::s4u::Engine::instance()->netcardList(&netcardList); + simgrid::s4u::Engine::instance()->netpointList(&netcardList); std::sort(netcardList.begin(), netcardList.end(), [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { return a->name() < b->name(); diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp index a3401ded69..9c9ef7ec0a 100644 --- a/teshsuite/simdag/is-router/is-router.cpp +++ b/teshsuite/simdag/is-router/is-router.cpp @@ -19,7 +19,7 @@ int main(int argc, char **argv) std::printf("Host count: %zu, link number: %d\n", sg_host_count(), sg_link_count()); std::vector netcardList; - simgrid::s4u::Engine::instance()->netcardList(&netcardList); + simgrid::s4u::Engine::instance()->netpointList(&netcardList); std::sort(netcardList.begin(), netcardList.end(), [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { return a->name() < b->name();