/* s4u::Engine Simulation Engine and global functions. */
-/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
Engine* Engine::get_instance()
{
if (Engine::instance_ == nullptr) {
- auto e = new Engine(0, nullptr);
+ auto e = new Engine(nullptr, nullptr);
xbt_assert(Engine::instance_ == e);
}
return Engine::instance_;
XBT_DEBUG("PARSE TIME: %g", (end - start));
}
-void Engine::register_function(const std::string& name, int (*code)(int, char**)) // deprecated
+void Engine::register_function(const std::string& name, int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329
{
kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
return xbt::wrap_main(code, std::move(args));
};
- register_function(name, std::move(code_factory));
+ register_function(name, code_factory);
}
-void Engine::register_default(int (*code)(int, char**)) // deprecated
+void Engine::register_default(int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329
{
register_default([code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
}
kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
return xbt::wrap_main(code, std::move(args));
};
- register_function(name, std::move(code_factory));
+ register_function(name, code_factory);
}
/** Registers the main function of an actor that will be launched from the deployment file */
void Engine::register_function(const std::string& name, const std::function<void(std::vector<std::string>)>& code)
{
- kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+ kernel::actor::ActorCodeFactory code_factory = [code{code}](std::vector<std::string> args) mutable {
return std::bind(std::move(code), std::move(args));
};
- register_function(name, std::move(code_factory));
+ register_function(name, code_factory);
}
/** Registers a function as the default main function of actors
*
*/
Host* Engine::host_by_name(const std::string& name) const
{
- if (pimpl->hosts_.find(name) == pimpl->hosts_.end())
+ auto host = pimpl->hosts_.find(name);
+ if (host == pimpl->hosts_.end())
throw std::invalid_argument(std::string("Host not found: '") + name + std::string("'"));
- return pimpl->hosts_.at(name);
+ return host->second;
}
/** @brief Find a host from its name (or nullptr if that host does not exist) */
*/
Link* Engine::link_by_name(const std::string& name) const
{
- if (pimpl->links_.find(name) == pimpl->links_.end())
+ auto link = pimpl->links_.find(name);
+ if (link == pimpl->links_.end())
throw std::invalid_argument(std::string("Link not found: ") + name);
-
- return pimpl->links_.at(name)->get_iface();
+ return link->second->get_iface();
}
-/** @brief Find an link from its name (or nullptr if that link does not exist) */
+/** @brief Find a link from its name (or nullptr if that link does not exist) */
Link* Engine::link_by_name_or_null(const std::string& name) const
{
auto link = pimpl->links_.find(name);
*/
Storage* Engine::storage_by_name(const std::string& name) const
{
- if (pimpl->storages_.find(name) == pimpl->storages_.end())
+ auto storage = pimpl->storages_.find(name);
+ if (storage == pimpl->storages_.end())
throw std::invalid_argument(std::string("Storage not found: ") + name);
-
- return pimpl->storages_.at(name)->get_iface();
+ return storage->second->get_iface();
}
/** @brief Find a storage from its name (or nullptr if that storage does not exist) */
{
std::vector<ActorPtr> actor_list;
for (auto const& kv : simix_global->process_list) {
- actor_list.push_back(kv.second->iface());
+ actor_list.push_back(kv.second->get_iface());
}
return actor_list;
}
{
std::vector<ActorPtr> actor_list;
for (auto const& kv : simix_global->process_list) {
- if (filter(kv.second->iface()))
- actor_list.push_back(kv.second->iface());
+ if (filter(kv.second->get_iface()))
+ actor_list.push_back(kv.second->get_iface());
}
return actor_list;
}