XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static void IB_create_host_callback(simgrid::s4u::Host& host){
+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;
- // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
-
- IBNode* act = new IBNode(id);
+ ((NetworkIBModel*)surf_network_model)->active_nodes.emplace(host.get_name(), IBNode(id));
id++;
- ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.get_name(), act});
}
-static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction* action,
+static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction& action,
simgrid::kernel::resource::Action::State /*previous*/)
{
using simgrid::kernel::resource::IBNode;
using simgrid::kernel::resource::NetworkIBModel;
- if (action->get_state() != simgrid::kernel::resource::Action::State::FINISHED)
+ if (action.get_state() != simgrid::kernel::resource::Action::State::FINISHED)
return;
- std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
- XBT_DEBUG("IB callback - action %p finished", action);
+ std::pair<IBNode*, IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[&action];
+ XBT_DEBUG("IB callback - action %p finished", &action);
- ((NetworkIBModel*)surf_network_model)->updateIBfactors(action, pair.first, pair.second, 1);
-
- ((NetworkIBModel*)surf_network_model)->active_comms.erase(action);
+ ((NetworkIBModel*)surf_network_model)->updateIBfactors(&action, pair.first, pair.second, 1);
+ ((NetworkIBModel*)surf_network_model)->active_comms.erase(&action);
}
-static void IB_action_init_callback(simgrid::kernel::resource::NetworkAction* action, simgrid::s4u::Host* src,
+static void IB_action_init_callback(simgrid::kernel::resource::NetworkAction& action, simgrid::s4u::Host* src,
simgrid::s4u::Host* dst)
{
simgrid::kernel::resource::NetworkIBModel* ibModel = (simgrid::kernel::resource::NetworkIBModel*)surf_network_model;
- simgrid::kernel::resource::IBNode* act_src;
- simgrid::kernel::resource::IBNode* act_dst;
-
- auto asrc = ibModel->active_nodes.find(src->get_name());
- if (asrc != ibModel->active_nodes.end()) {
- act_src = asrc->second;
- } else {
- throw std::out_of_range(std::string("Could not find '") + src->get_cname() + "' active comms !");
- }
+ simgrid::kernel::resource::IBNode* act_src = &ibModel->active_nodes.at(src->get_name());
+ simgrid::kernel::resource::IBNode* act_dst = &ibModel->active_nodes.at(dst->get_name());
- auto adst = ibModel->active_nodes.find(dst->get_name());
- if (adst != ibModel->active_nodes.end()) {
- act_dst = adst->second;
- } else {
- throw std::out_of_range(std::string("Could not find '") + dst->get_cname() + "' active comms !");
- }
-
- ibModel->active_comms[action]=std::make_pair(act_src, act_dst);
-
- ibModel->updateIBfactors(action, act_src, act_dst, 0);
+ ibModel->active_comms[&action] = std::make_pair(act_src, act_dst);
+ ibModel->updateIBfactors(&action, act_src, act_dst, 0);
}
/*********
{
/* Do not add this into all_existing_models: our ancestor already does so */
- std::string IB_factors_string = simgrid::config::get_value<std::string>("smpi/IB-penalty-factors");
+ 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(";"));
}
}
-NetworkIBModel::~NetworkIBModel()
-{
- for (auto const& instance : active_nodes)
- delete instance.second;
-}
-
void NetworkIBModel::computeIBfactors(IBNode* root)
{
- double num_comm_out = static_cast<double>(root->ActiveCommsUp.size());
+ double num_comm_out = root->ActiveCommsUp.size();
double max_penalty_out = 0.0;
// first, compute all outbound penalties to get their max
for (std::vector<ActiveComm*>::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
updateIBfactors_rec(from, updated);
XBT_DEBUG("IB - Finished updating %d", from->id);
}
-}
-}
+} // namespace resource
+} // namespace kernel
} // namespace simgrid