-/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2022. 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. */
-#include "src/surf/network_ib.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+
#include "simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "surf/surf.hpp"
+#include "src/surf/network_ib.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
-static void IB_create_host_callback(simgrid::s4u::Host const& host)
-{
- using simgrid::kernel::resource::IBNode;
- using simgrid::kernel::resource::NetworkIBModel;
-
- static int id = 0;
- auto* ibModel = static_cast<NetworkIBModel*>(host.get_netpoint()->get_englobing_zone()->get_network_model().get());
- ibModel->active_nodes.emplace(host.get_name(), IBNode(id));
- id++;
-}
-
-static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction& action,
- simgrid::kernel::resource::Action::State /*previous*/)
-{
- using simgrid::kernel::resource::IBNode;
-
- if (action.get_state() != simgrid::kernel::resource::Action::State::FINISHED)
- return;
- auto* ibModel = static_cast<simgrid::kernel::resource::NetworkIBModel*>(action.get_model());
- std::pair<IBNode*, IBNode*> pair = ibModel->active_comms[&action];
- XBT_DEBUG("IB callback - action %p finished", &action);
-
- ibModel->update_IB_factors(&action, pair.first, pair.second, 1);
-
- ibModel->active_comms.erase(&action);
-}
-
-static void IB_action_init_callback(simgrid::kernel::resource::NetworkAction& action)
-{
- auto* ibModel = static_cast<simgrid::kernel::resource::NetworkIBModel*>(action.get_model());
- auto* act_src = &ibModel->active_nodes.at(action.get_src().get_name());
- auto* act_dst = &ibModel->active_nodes.at(action.get_dst().get_name());
-
- ibModel->active_comms[&action] = std::make_pair(act_src, act_dst);
- ibModel->update_IB_factors(&action, act_src, act_dst, 0);
-}
-
/*********
* Model *
*********/
/* } */
void surf_network_model_init_IB()
{
- auto net_model = std::make_shared<simgrid::kernel::resource::NetworkIBModel>("Network_IB");
- simgrid::kernel::EngineImpl::get_instance()->add_model(net_model);
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
+ using simgrid::kernel::resource::NetworkIBModel;
- simgrid::s4u::Link::on_communication_state_change.connect(IB_action_state_changed_callback);
- simgrid::s4u::Link::on_communicate.connect(IB_action_init_callback);
- simgrid::s4u::Host::on_creation.connect(IB_create_host_callback);
+ auto net_model = std::make_shared<NetworkIBModel>("Network_IB");
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(net_model);
+ engine->get_netzone_root()->set_network_model(net_model);
+
+ simgrid::s4u::Link::on_communication_state_change_cb(NetworkIBModel::IB_action_state_changed_callback);
+ simgrid::kernel::activity::CommImpl::on_start.connect(NetworkIBModel::IB_comm_start_callback);
+ simgrid::s4u::Host::on_creation_cb(NetworkIBModel::IB_create_host_callback);
simgrid::config::set_default<double>("network/weight-S", 8775);
}
namespace kernel {
namespace resource {
+void NetworkIBModel::IB_create_host_callback(s4u::Host const& host)
+{
+ static int id = 0;
+ auto* ibModel = static_cast<NetworkIBModel*>(host.get_netpoint()->get_englobing_zone()->get_network_model().get());
+ ibModel->active_nodes.try_emplace(host.get_name(), IBNode(id));
+ id++;
+}
+
+void NetworkIBModel::IB_action_state_changed_callback(NetworkAction& action, Action::State /*previous*/)
+{
+ if (action.get_state() != Action::State::FINISHED)
+ return;
+ auto* ibModel = static_cast<NetworkIBModel*>(action.get_model());
+ std::pair<IBNode*, IBNode*> pair = ibModel->active_comms[&action];
+
+ XBT_DEBUG("IB callback - action %p finished", &action);
+ ibModel->update_IB_factors(&action, pair.first, pair.second, 1);
+ ibModel->active_comms.erase(&action);
+}
+
+void NetworkIBModel::IB_comm_start_callback(const activity::CommImpl& comm)
+{
+ auto* action = static_cast<NetworkAction*>(comm.surf_action_);
+ auto* ibModel = static_cast<NetworkIBModel*>(action->get_model());
+ auto* act_src = &ibModel->active_nodes.at(action->get_src().get_name());
+ auto* act_dst = &ibModel->active_nodes.at(action->get_dst().get_name());
+
+ ibModel->active_comms[action] = std::make_pair(act_src, act_dst);
+ ibModel->update_IB_factors(action, act_src, act_dst, 0);
+}
+
NetworkIBModel::NetworkIBModel(const std::string& name) : NetworkSmpiModel(name)
{
std::string IB_factors_string = config::get_value<std::string>("smpi/IB-penalty-factors");
std::vector<std::string> radical_elements;
boost::split(radical_elements, IB_factors_string, boost::is_any_of(";"));
- surf_parse_assert(radical_elements.size() == 3, "smpi/IB-penalty-factors should be provided and contain 3 "
- "elements, semi-colon separated. Example: 0.965;0.925;1.35");
+ xbt_assert(radical_elements.size() == 3, "smpi/IB-penalty-factors should be provided and contain 3 "
+ "elements, semi-colon separated. Example: 0.965;0.925;1.35");
try {
Be_ = std::stod(radical_elements.front());
void NetworkIBModel::compute_IB_factors(IBNode* root) const
{
- double num_comm_out = root->active_comms_up_.size();
+ size_t num_comm_out = root->active_comms_up_.size();
double max_penalty_out = 0.0;
// first, compute all outbound penalties to get their max
for (ActiveComm const* comm : root->active_comms_up_) {
