-/* 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>
engine->add_model(net_model);
engine->get_netzone_root()->set_network_model(net_model);
- simgrid::s4u::Link::on_communication_state_change.connect(NetworkIBModel::IB_action_state_changed_callback);
- simgrid::s4u::Link::on_communicate.connect(NetworkIBModel::IB_action_init_callback);
- simgrid::s4u::Host::on_creation.connect(NetworkIBModel::IB_create_host_callback);
+ 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 simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::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.emplace(host.get_name(), IBNode(id));
+ ibModel->active_nodes.try_emplace(host.get_name(), id);
id++;
}
{
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];
+ auto* ibModel = static_cast<NetworkIBModel*>(action.get_model());
+ auto [src, dst] = ibModel->active_comms[&action];
XBT_DEBUG("IB callback - action %p finished", &action);
- ibModel->update_IB_factors(&action, pair.first, pair.second, 1);
+ ibModel->update_IB_factors(&action, src, dst, 1);
ibModel->active_comms.erase(&action);
}
-void NetworkIBModel::IB_action_init_callback(NetworkAction& action)
+void NetworkIBModel::IB_comm_start_callback(const activity::CommImpl& comm)
{
- 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());
+ 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);
+ 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::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());
for (ActiveComm* comm : root->active_comms_up_) {
// compute inbound penalty
double my_penalty_in = 1.0;
- int nb_comms = comm->destination->nb_active_comms_down_; // total number of incoming comms
- if (nb_comms != 1)
+ if (comm->destination->nb_active_comms_down_ != 1) // total number of incoming comms
my_penalty_in = (comm->destination->active_comms_down_)[root] // number of comm sent to dest by root node
* Be_ * comm->destination->active_comms_down_.size(); // number of different nodes sending to dest
if (not updatedlist[comm->destination->id_])
update_IB_factors_rec(comm->destination, updatedlist);
}
- for (std::map<IBNode*, int>::value_type const& comm : root->active_comms_down_) {
- if (not updatedlist[comm.first->id_])
- update_IB_factors_rec(comm.first, updatedlist);
+ for (auto const& [comm, _] : root->active_comms_down_) {
+ if (not updatedlist[comm->id_])
+ update_IB_factors_rec(comm, updatedlist);
}
}
}
to->active_comms_down_[from] -= 1;
to->nb_active_comms_down_--;
- auto it = std::find_if(begin(from->active_comms_up_), end(from->active_comms_up_),
- [action](const ActiveComm* comm) { return comm->action == action; });
- if (it != std::end(from->active_comms_up_)) {
+ if (auto it = std::find_if(begin(from->active_comms_up_), end(from->active_comms_up_),
+ [action](const ActiveComm* comm) { return comm->action == action; });
+ it != std::end(from->active_comms_up_)) {
delete *it;
from->active_comms_up_.erase(it);
}
update_IB_factors_rec(from, updated);
XBT_DEBUG("IB - Finished updating %d", from->id_);
}
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
