Engine::Engine(int *argc, char **argv) {
xbt_assert(s4u::Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
- s4u::Engine::instance_ = this;
- pimpl = new kernel::EngineImpl();
-
TRACE_global_init();
SIMIX_global_init(argc, argv);
+
+ pimpl = new kernel::EngineImpl();
+ s4u::Engine::instance_ = this;
}
Engine::~Engine()
void Engine::shutdown() {
delete s4u::Engine::instance_;
+ s4u::Engine::instance_ = nullptr;
}
double Engine::getClock()
/** @brief Fills the passed list with all hosts found in the platform */
void Engine::getHostList(std::vector<Host*>* list)
{
- for (auto kv : host_list)
+ for (auto const& kv : host_list)
list->push_back(kv.second);
}
if (not strcmp(current->getCname(), name))
return current;
- for (auto elem : *(current->getChildren())) {
+ for (auto const& elem : *(current->getChildren())) {
simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
if (tmp != nullptr) {
return tmp;
}
/** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
-simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(const char* name)
+simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(std::string name)
{
- try {
- return pimpl->netpoints_.at(name);
- } catch (std::out_of_range& unfound) {
- return nullptr;
- }
+ auto netp = pimpl->netpoints_.find(name);
+ return netp == pimpl->netpoints_.end() ? nullptr : netp->second;
}
+
/** @brief Fill the provided vector with all existing netpoints */
void Engine::getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)
{
- for (auto kv : pimpl->netpoints_)
+ for (auto const& kv : pimpl->netpoints_)
list->push_back(kv.second);
}
/** @brief Register a new netpoint to the system */