#include <algorithm>
#include <string>
-XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface");
+XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (SimGrid for you) interface");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_engine, s4u, "Logging specific to S4U (engine)");
static simgrid::kernel::actor::ActorCode maestro_code;
xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
Engine::instance_ = this;
instr::init();
- pimpl->initialize(argc, argv);
+ pimpl_->initialize(argc, argv);
// Either create a new context with maestro or create
// a context object with the current context maestro):
kernel::actor::create_maestro(maestro_code);
}
-Engine::Engine(std::string name) : pimpl(new kernel::EngineImpl())
+Engine::Engine(std::string name) : pimpl_(new kernel::EngineImpl())
{
int argc = 1;
char* argv = &name[0];
initialize(&argc, &argv);
}
-Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl())
+Engine::Engine(int* argc, char** argv) : pimpl_(new kernel::EngineImpl())
{
initialize(argc, argv);
}
Engine* Engine::get_instance(int* argc, char** argv)
{
if (Engine::instance_ == nullptr) {
- auto e = new Engine(argc, argv);
+ const auto* e = new Engine(argc, argv);
xbt_assert(Engine::instance_ == e);
}
return Engine::instance_;
}
+const std::vector<std::string>& Engine::get_cmdline() const
+{
+ return pimpl_->get_cmdline();
+}
void Engine::shutdown() // XBT_ATTRIB_DEPRECATED_v335
{
void Engine::add_model(std::shared_ptr<kernel::resource::Model> model,
const std::vector<kernel::resource::Model*>& dependencies)
{
- kernel::actor::simcall_answered([this, &model, &dependencies] { pimpl->add_model(std::move(model), dependencies); });
+ kernel::actor::simcall_answered([this, &model, &dependencies] { pimpl_->add_model(std::move(model), dependencies); });
}
const std::vector<simgrid::kernel::resource::Model*>& Engine::get_all_models() const
{
- return pimpl->get_all_models();
+ return pimpl_->get_all_models();
}
void Engine::load_platform(const std::string& platf) const
{
- pimpl->load_platform(platf);
+ pimpl_->load_platform(platf);
}
void Engine::seal_platform() const
{
- pimpl->seal_platform();
+ pimpl_->seal_platform();
}
static void flatify_hosts(Engine const& engine, std::stringstream& ss)
}
void Engine::register_default(const kernel::actor::ActorCodeFactory& code)
{
- simgrid::kernel::actor::simcall_answered([this, &code]() { pimpl->register_default(code); });
+ simgrid::kernel::actor::simcall_answered([this, &code]() { pimpl_->register_default(code); });
}
void Engine::register_function(const std::string& name, const kernel::actor::ActorCodeFactory& code)
{
- simgrid::kernel::actor::simcall_answered([this, name, &code]() { pimpl->register_function(name, code); });
+ simgrid::kernel::actor::simcall_answered([this, name, &code]() { pimpl_->register_function(name, code); });
}
/** Load a deployment file and launch the actors that it contains
*/
void Engine::load_deployment(const std::string& deploy) const
{
- pimpl->load_deployment(deploy);
+ pimpl_->load_deployment(deploy);
}
/** Returns the amount of hosts in the platform */
std::vector<Host*> Engine::get_filtered_hosts(const std::function<bool(Host*)>& filter) const
{
std::vector<Host*> hosts;
- if (pimpl->netzone_root_) {
- hosts = pimpl->netzone_root_->get_filtered_hosts(filter);
+ if (pimpl_->netzone_root_) {
+ hosts = pimpl_->netzone_root_->get_filtered_hosts(filter);
}
/* Sort hosts in lexicographical order: keep same behavior when the hosts were saved on Engine
* Some tests do a get_all_hosts() and selects hosts in this order */
Host* Engine::host_by_name_or_null(const std::string& name) const
{
Host* host = nullptr;
- if (pimpl->netzone_root_) {
- auto* host_impl = pimpl->netzone_root_->get_host_by_name_or_null(name);
+ if (pimpl_->netzone_root_) {
+ auto* host_impl = pimpl_->netzone_root_->get_host_by_name_or_null(name);
if (host_impl)
host = host_impl->get_iface();
}
SplitDuplexLink* Engine::split_duplex_link_by_name(const std::string& name) const
{
- auto* link_impl = pimpl->netzone_root_ ? pimpl->netzone_root_->get_split_duplex_link_by_name_or_null(name) : nullptr;
+ auto* link_impl =
+ pimpl_->netzone_root_ ? pimpl_->netzone_root_->get_split_duplex_link_by_name_or_null(name) : nullptr;
if (not link_impl)
throw std::invalid_argument("Link not found: " + name);
return link_impl->get_iface();
Link* Engine::link_by_name_or_null(const std::string& name) const
{
Link* link = nullptr;
- if (pimpl->netzone_root_) {
+ if (pimpl_->netzone_root_) {
/* keep behavior where internal __loopback__ link from network model is given to user */
if (name == "__loopback__")
- return pimpl->netzone_root_->get_network_model()->loopback_->get_iface();
- auto* link_impl = pimpl->netzone_root_->get_link_by_name_or_null(name);
+ return pimpl_->netzone_root_->get_network_model()->loopback_->get_iface();
+ auto* link_impl = pimpl_->netzone_root_->get_link_by_name_or_null(name);
if (link_impl)
link = link_impl->get_iface();
}
{
/* two actors may have pushed the same mbox_create simcall at the same time */
kernel::activity::MailboxImpl* mbox = kernel::actor::simcall_answered([&name, this] {
- auto [m, inserted] = pimpl->mailboxes_.try_emplace(name, nullptr);
+ auto [m, inserted] = pimpl_->mailboxes_.try_emplace(name, nullptr);
if (inserted) {
m->second = new kernel::activity::MailboxImpl(name);
XBT_DEBUG("Creating a mailbox at %p with name %s", m->second, name.c_str());
size_t Engine::get_link_count() const
{
int count = 0;
- if (pimpl->netzone_root_) {
- count += pimpl->netzone_root_->get_link_count();
+ if (pimpl_->netzone_root_) {
+ count += pimpl_->netzone_root_->get_link_count();
/* keep behavior where internal __loopback__ link from network model is given to user */
- count += pimpl->netzone_root_->get_network_model()->loopback_ ? 1 : 0;
+ count += pimpl_->netzone_root_->get_network_model()->loopback_ ? 1 : 0;
}
return count;
}
std::vector<Link*> Engine::get_filtered_links(const std::function<bool(Link*)>& filter) const
{
std::vector<Link*> res;
- if (pimpl->netzone_root_) {
- res = pimpl->netzone_root_->get_filtered_links(filter);
+ if (pimpl_->netzone_root_) {
+ res = pimpl_->netzone_root_->get_filtered_links(filter);
/* keep behavior where internal __loopback__ link from network model is given to user */
- if (pimpl->netzone_root_->get_network_model()->loopback_ &&
- filter(pimpl->netzone_root_->get_network_model()->loopback_->get_iface()))
- res.push_back(pimpl->netzone_root_->get_network_model()->loopback_->get_iface());
+ if (pimpl_->netzone_root_->get_network_model()->loopback_ &&
+ filter(pimpl_->netzone_root_->get_network_model()->loopback_->get_iface()))
+ res.push_back(pimpl_->netzone_root_->get_network_model()->loopback_->get_iface());
}
return res;
}
size_t Engine::get_actor_count() const
{
- return pimpl->get_actor_count();
+ return pimpl_->get_actor_count();
}
std::vector<ActorPtr> Engine::get_all_actors() const
{
std::vector<ActorPtr> actor_list;
- for (auto const& [_, actor] : pimpl->get_actor_list()) {
+ for (auto const& [_, actor] : pimpl_->get_actor_list()) {
actor_list.push_back(actor->get_iface());
}
return actor_list;
std::vector<ActorPtr> Engine::get_filtered_actors(const std::function<bool(ActorPtr)>& filter) const
{
std::vector<ActorPtr> actor_list;
- for (auto const& [_, actor] : pimpl->get_actor_list()) {
+ for (auto const& [_, actor] : pimpl_->get_actor_list()) {
if (filter(actor->get_iface()))
actor_list.push_back(actor->get_iface());
}
fflush(stdout);
fflush(stderr);
- pimpl->run(max_date);
+ pimpl_->run(max_date);
}
void Engine::track_vetoed_activities(std::set<Activity*>* vetoed_activities) const
/** @brief Retrieve the root netzone, containing all others */
s4u::NetZone* Engine::get_netzone_root() const
{
- if (pimpl->netzone_root_)
- return pimpl->netzone_root_->get_iface();
+ if (pimpl_->netzone_root_)
+ return pimpl_->netzone_root_->get_iface();
return nullptr;
}
/** @brief Set the root netzone, containing all others. Once set, it cannot be changed. */
void Engine::set_netzone_root(const s4u::NetZone* netzone)
{
- xbt_assert(pimpl->netzone_root_ == nullptr, "The root NetZone cannot be changed once set");
- pimpl->netzone_root_ = netzone->get_impl();
+ xbt_assert(pimpl_->netzone_root_ == nullptr, "The root NetZone cannot be changed once set");
+ pimpl_->netzone_root_ = netzone->get_impl();
}
static NetZone* netzone_by_name_recursive(NetZone* current, const std::string& name)
/** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(const std::string& name) const
{
- auto netp = pimpl->netpoints_.find(name);
- return netp == pimpl->netpoints_.end() ? nullptr : netp->second;
+ auto netp = pimpl_->netpoints_.find(name);
+ return netp == pimpl_->netpoints_.end() ? nullptr : netp->second;
}
kernel::routing::NetPoint* Engine::netpoint_by_name(const std::string& name) const
{
- auto netp = netpoint_by_name_or_null(name);
+ auto* netp = netpoint_by_name_or_null(name);
if (netp == nullptr) {
throw std::invalid_argument("Netpoint not found: " + name);
}
std::vector<kernel::routing::NetPoint*> Engine::get_all_netpoints() const
{
std::vector<kernel::routing::NetPoint*> res;
- for (auto const& [_, netpoint] : pimpl->netpoints_)
+ for (auto const& [_, netpoint] : pimpl_->netpoints_)
res.push_back(netpoint);
return res;
}
/** @brief Register a new netpoint to the system */
void Engine::netpoint_register(kernel::routing::NetPoint* point)
{
- simgrid::kernel::actor::simcall_answered([this, point] { pimpl->netpoints_[point->get_name()] = point; });
+ simgrid::kernel::actor::simcall_answered([this, point] { pimpl_->netpoints_[point->get_name()] = point; });
}
/** @brief Unregister a given netpoint */
void Engine::netpoint_unregister(kernel::routing::NetPoint* point)
{
kernel::actor::simcall_answered([this, point] {
- pimpl->netpoints_.erase(point->get_name());
+ pimpl_->netpoints_.erase(point->get_name());
delete point;
});
}