-/* Copyright (c) 2014-2018. The SimGrid Team.
-*All rights reserved. */
+/* Copyright (c) 2014-2019. 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 <utility>
-
+#include "src/surf/network_ib.hpp"
#include "simgrid/sg_config.hpp"
-#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/network_ib.hpp"
#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
+
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
static void IB_create_host_callback(simgrid::s4u::Host& host){
- using simgrid::surf::NetworkIBModel;
- using simgrid::surf::IBNode;
+ 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);
id++;
- ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.getName(), act});
+ ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.get_name(), act});
}
-static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* action)
+static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction* action,
+ simgrid::kernel::resource::Action::State /*previous*/)
{
- using simgrid::surf::NetworkIBModel;
- using simgrid::surf::IBNode;
+ using simgrid::kernel::resource::IBNode;
+ using simgrid::kernel::resource::NetworkIBModel;
- if (action->get_state() != simgrid::kernel::resource::Action::State::done)
+ 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);
}
-static void IB_action_init_callback(simgrid::surf::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::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model;
- simgrid::surf::IBNode* act_src;
- simgrid::surf::IBNode* act_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->getName());
+ 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->getCname() + "' active comms !");
+ throw std::out_of_range(std::string("Could not find '") + src->get_cname() + "' active comms !");
}
- auto adst = ibModel->active_nodes.find(dst->getName());
+ 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->getCname() + "' active comms !");
+ 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);
/* } */
void surf_network_model_init_IB()
{
- if (surf_network_model)
- return;
-
- surf_network_model = new simgrid::surf::NetworkIBModel();
- all_existing_models->push_back(surf_network_model);
- simgrid::s4u::Link::onCommunicationStateChange.connect(IB_action_state_changed_callback);
- simgrid::s4u::Link::onCommunicate.connect(IB_action_init_callback);
- simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
- xbt_cfg_setdefault_double("network/weight-S", 8775);
+ xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
+ surf_network_model = new 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);
+ simgrid::config::set_default<double>("network/weight-S", 8775);
}
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
NetworkIBModel::NetworkIBModel() : NetworkSmpiModel()
{
- std::string IB_factors_string = xbt_cfg_get_string("smpi/IB-penalty-factors");
+ /* 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::vector<std::string> radical_elements;
boost::split(radical_elements, IB_factors_string, boost::is_any_of(";"));
if (from == to) // disregard local comms (should use loopback)
return;
- ActiveComm* comm = nullptr;
if (remove) {
if (to->ActiveCommsDown[from] == 1)
to->ActiveCommsDown.erase(from);
to->nbActiveCommsDown--;
for (std::vector<ActiveComm*>::iterator it = from->ActiveCommsUp.begin(); it != from->ActiveCommsUp.end(); ++it) {
if ((*it)->action == action) {
- comm = (*it);
+ delete *it;
from->ActiveCommsUp.erase(it);
break;
}
std::vector<bool> updated(active_nodes.size(), false);
updateIBfactors_rec(from, updated);
XBT_DEBUG("IB - Finished updating %d", from->id);
- delete comm;
}
}
}
+} // namespace simgrid
