X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c12189c716ea527ddcf8f8b55983213dead2bf..c159323728cd5c412af5e7bba947e5e002463d73:/src/s4u/s4u_engine.cpp diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp index 49844d197b..0906e7d045 100644 --- a/src/s4u/s4u_engine.cpp +++ b/src/s4u/s4u_engine.cpp @@ -23,6 +23,8 @@ XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface"); namespace simgrid { namespace s4u { +xbt::signal onPlatformCreated; +xbt::signal onSimulationEnd; Engine *Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */ @@ -111,32 +113,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; }); } }