-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2014-2018. 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 "network_ib.hpp"
-
+#include "src/surf/network_ib.hpp"
+#include "simgrid/sg_config.hpp"
#include "src/surf/HostImpl.hpp"
-#include "simgrid/sg_config.h"
-#include "maxmin_private.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
- if(((NetworkIBModel*)surf_network_model)->active_nodes==nullptr)
- ((NetworkIBModel*)surf_network_model)->active_nodes=xbt_dict_new();
IBNode* act = new IBNode(id);
id++;
- xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes,
- host.name().c_str(), act, nullptr);
-
+ ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.get_name(), act});
}
-static void IB_action_state_changed_callback(
- simgrid::surf::NetworkAction *action,
- simgrid::surf::Action::State statein, simgrid::surf::Action::State stateout)
+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(statein!=simgrid::surf::Action::State::running || stateout!=simgrid::surf::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::kernel::routing::NetCard *src, simgrid::kernel::routing::NetCard *dst)
+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*) xbt_dict_get_or_null(ibModel->active_nodes, src->name());
- xbt_assert(act_src, "could not find src node active comms !");
+ 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::surf::IBNode* act_dst= (simgrid::surf::IBNode*) xbt_dict_get_or_null(ibModel->active_nodes, dst->name());
- xbt_assert(act_dst, "could not find dst node active comms !");
+ 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);
/* month=june, */
/* year={2010} */
/* } */
-void surf_network_model_init_IB(void)
+void surf_network_model_init_IB()
{
- using simgrid::surf::networkActionStateChangedCallbacks;
-
- if (surf_network_model)
- return;
-
- surf_network_model = new simgrid::surf::NetworkIBModel();
- xbt_dynar_push(all_existing_models, &surf_network_model);
- networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
- 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);
}
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-
namespace simgrid {
- namespace surf {
-
- NetworkIBModel::NetworkIBModel()
- : NetworkSmpiModel() {
- haveGap_=false;
- active_nodes=nullptr;
-
- const char* IB_factors_string=xbt_cfg_get_string("smpi/IB-penalty-factors");
- xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";");
-
- surf_parse_assert(xbt_dynar_length(radical_elements)==3,
- "smpi/IB-penalty-factors should be provided and contain 3 elements, semi-colon separated. Example: 0.965;0.925;1.35");
-
- Be = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 0, char *), "First part of smpi/IB-penalty-factors is not numerical: %s");
- Bs = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 1, char *), "Second part of smpi/IB-penalty-factors is not numerical: %s");
- ys = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 2, char *), "Third part of smpi/IB-penalty-factors is not numerical: %s");
+namespace kernel {
+namespace resource {
- xbt_dynar_free(&radical_elements);
- }
+NetworkIBModel::NetworkIBModel() : NetworkSmpiModel()
+{
+ /* Do not add this into all_existing_models: our ancestor already does so */
- NetworkIBModel::~NetworkIBModel()
- {
- xbt_dict_cursor_t cursor = nullptr;
- IBNode* instance = nullptr;
- char *name = nullptr;
- xbt_dict_foreach(active_nodes, cursor, name, instance)
- delete instance;
- xbt_dict_free(&active_nodes);
- }
+ 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(";"));
- void NetworkIBModel::computeIBfactors(IBNode *root) {
- double penalized_bw=0.0;
- double num_comm_out = (double) 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) {
- double my_penalty_out = 1.0;
-
- if(num_comm_out!=1){
- if((*it)->destination->nbActiveCommsDown > 2)//number of comms sent to the receiving node
- my_penalty_out = num_comm_out * Bs * ys;
- else
- my_penalty_out = num_comm_out * Bs;
- }
-
- max_penalty_out = std::max(max_penalty_out,my_penalty_out);
- }
+ 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");
- for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
+ try {
+ Be = std::stod(radical_elements.front());
+ } catch (std::invalid_argument& ia) {
+ throw std::invalid_argument(std::string("First part of smpi/IB-penalty-factors is not numerical:") + ia.what());
+ }
- //compute inbound penalty
- double my_penalty_in = 1.0;
- int nb_comms = (*it)->destination->nbActiveCommsDown;//total number of incoming comms
- if(nb_comms!=1)
- my_penalty_in = ((*it)->destination->ActiveCommsDown)[root] //number of comm sent to dest by root node
- * Be
- * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
+ try {
+ Bs = std::stod(radical_elements.at(1));
+ } catch (std::invalid_argument& ia) {
+ throw std::invalid_argument(std::string("Second part of smpi/IB-penalty-factors is not numerical:") + ia.what());
+ }
- double penalty = std::max(my_penalty_in,max_penalty_out);
+ try {
+ ys = std::stod(radical_elements.back());
+ } catch (std::invalid_argument& ia) {
+ throw std::invalid_argument(std::string("Third part of smpi/IB-penalty-factors is not numerical:") + ia.what());
+ }
+}
- double rate_before_update = (*it)->action->getBound();
- //save initial rate of the action
- if((*it)->init_rate==-1)
- (*it)->init_rate= rate_before_update;
+NetworkIBModel::~NetworkIBModel()
+{
+ for (auto const& instance : active_nodes)
+ delete instance.second;
+}
- penalized_bw= ! num_comm_out ? (*it)->init_rate : (*it)->init_rate /penalty;
+void NetworkIBModel::computeIBfactors(IBNode* root)
+{
+ double num_comm_out = static_cast<double>(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) {
+ double my_penalty_out = 1.0;
+
+ if (num_comm_out != 1) {
+ if ((*it)->destination->nbActiveCommsDown > 2) // number of comms sent to the receiving node
+ my_penalty_out = num_comm_out * Bs * ys;
+ else
+ my_penalty_out = num_comm_out * Bs;
+ }
- if (!double_equals(penalized_bw, rate_before_update, sg_surf_precision)){
- XBT_DEBUG("%d->%d action %p penalty updated : bw now %f, before %f , initial rate %f", root->id,(*it)->destination->id,(*it)->action,penalized_bw, (*it)->action->getBound(), (*it)->init_rate );
- lmm_update_variable_bound(maxminSystem_, (*it)->action->getVariable(), penalized_bw);
- }else{
- XBT_DEBUG("%d->%d action %p penalty not updated : bw %f, initial rate %f", root->id,(*it)->destination->id,(*it)->action,penalized_bw, (*it)->init_rate );
- }
+ max_penalty_out = std::max(max_penalty_out, my_penalty_out);
+ }
- }
- XBT_DEBUG("Finished computing IB penalties");
+ for (std::vector<ActiveComm*>::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
+ // compute inbound penalty
+ double my_penalty_in = 1.0;
+ int nb_comms = (*it)->destination->nbActiveCommsDown; // total number of incoming comms
+ if (nb_comms != 1)
+ my_penalty_in = ((*it)->destination->ActiveCommsDown)[root] // number of comm sent to dest by root node
+ * Be * (*it)->destination->ActiveCommsDown.size(); // number of different nodes sending to dest
+
+ double penalty = std::max(my_penalty_in, max_penalty_out);
+
+ double rate_before_update = (*it)->action->get_bound();
+ // save initial rate of the action
+ if ((*it)->init_rate == -1)
+ (*it)->init_rate = rate_before_update;
+
+ double penalized_bw = num_comm_out ? (*it)->init_rate / penalty : (*it)->init_rate;
+
+ if (not double_equals(penalized_bw, rate_before_update, sg_surf_precision)) {
+ XBT_DEBUG("%d->%d action %p penalty updated : bw now %f, before %f , initial rate %f", root->id,
+ (*it)->destination->id, (*it)->action, penalized_bw, (*it)->action->get_bound(), (*it)->init_rate);
+ get_maxmin_system()->update_variable_bound((*it)->action->get_variable(), penalized_bw);
+ } else {
+ XBT_DEBUG("%d->%d action %p penalty not updated : bw %f, initial rate %f", root->id, (*it)->destination->id,
+ (*it)->action, penalized_bw, (*it)->init_rate);
}
+ }
+ XBT_DEBUG("Finished computing IB penalties");
+}
- void NetworkIBModel::updateIBfactors_rec(IBNode *root, bool* updatedlist) {
- if(updatedlist[root->id]==0){
- XBT_DEBUG("IB - Updating rec %d", root->id);
- computeIBfactors(root);
- updatedlist[root->id]=1;
- for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
- if(updatedlist[(*it)->destination->id]!=1)
- updateIBfactors_rec((*it)->destination, updatedlist);
- }
- for (std::map<IBNode*, int>::iterator it= root->ActiveCommsDown.begin(); it != root->ActiveCommsDown.end(); ++it) {
- if(updatedlist[it->first->id]!=1)
- updateIBfactors_rec(it->first, updatedlist);
- }
- }
+void NetworkIBModel::updateIBfactors_rec(IBNode* root, std::vector<bool>& updatedlist)
+{
+ if (not updatedlist[root->id]) {
+ XBT_DEBUG("IB - Updating rec %d", root->id);
+ computeIBfactors(root);
+ updatedlist[root->id] = true;
+ for (std::vector<ActiveComm*>::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
+ if (not updatedlist[(*it)->destination->id])
+ updateIBfactors_rec((*it)->destination, updatedlist);
+ }
+ for (std::map<IBNode*, int>::iterator it = root->ActiveCommsDown.begin(); it != root->ActiveCommsDown.end(); ++it) {
+ if (not updatedlist[it->first->id])
+ updateIBfactors_rec(it->first, updatedlist);
}
+ }
+}
+void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode* to, int remove)
+{
+ if (from == to) // disregard local comms (should use loopback)
+ return;
- void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove) {
- if (from == to)//disregard local comms (should use loopback)
- return;
-
- bool* updated=(bool*)xbt_malloc0(xbt_dict_size(active_nodes)*sizeof(bool));
- ActiveComm* comm=nullptr;
- if(remove){
- if(to->ActiveCommsDown[from]==1)
- to->ActiveCommsDown.erase(from);
- else
- to->ActiveCommsDown[from]-=1;
-
- to->nbActiveCommsDown--;
- for (std::vector<ActiveComm*>::iterator it= from->ActiveCommsUp.begin();
- it != from->ActiveCommsUp.end(); ++it) {
- if((*it)->action==action){
- comm=(*it);
- from->ActiveCommsUp.erase(it);
- break;
- }
- }
- action->unref();
-
- }else{
- action->ref();
- ActiveComm* comm=new ActiveComm();
- comm->action=action;
- comm->destination=to;
- from->ActiveCommsUp.push_back(comm);
-
- to->ActiveCommsDown[from]+=1;
- to->nbActiveCommsDown++;
+ ActiveComm* comm = nullptr;
+ if (remove) {
+ if (to->ActiveCommsDown[from] == 1)
+ to->ActiveCommsDown.erase(from);
+ else
+ to->ActiveCommsDown[from] -= 1;
+
+ to->nbActiveCommsDown--;
+ for (std::vector<ActiveComm*>::iterator it = from->ActiveCommsUp.begin(); it != from->ActiveCommsUp.end(); ++it) {
+ if ((*it)->action == action) {
+ comm = (*it);
+ from->ActiveCommsUp.erase(it);
+ break;
}
- XBT_DEBUG("IB - Updating %d", from->id);
- updateIBfactors_rec(from, updated);
- XBT_DEBUG("IB - Finished updating %d", from->id);
- if(comm)
- delete comm;
- xbt_free(updated);
}
-
+ action->unref();
+ } else {
+ action->ref();
+ ActiveComm* comm = new ActiveComm();
+ comm->action = action;
+ comm->destination = to;
+ from->ActiveCommsUp.push_back(comm);
+
+ to->ActiveCommsDown[from] += 1;
+ to->nbActiveCommsDown++;
}
+ XBT_DEBUG("IB - Updating %d", from->id);
+ std::vector<bool> updated(active_nodes.size(), false);
+ updateIBfactors_rec(from, updated);
+ XBT_DEBUG("IB - Finished updating %d", from->id);
+ delete comm;
+}
+}
}
+} // namespace simgrid
