Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Prefer using "try_emplace" (sonar, c++17).
[simgrid.git] / src / surf / network_ib.cpp
index 831dbdb..c6362f6 100644 (file)
@@ -1,70 +1,20 @@
-/* Copyright (c) 2014-2015. 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 <utility>
-
-#include "network_ib.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 "simgrid/sg_config.h"
-#include "maxmin_private.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;
-
-  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);
-
-}
-
-static void IB_action_state_changed_callback(
-    simgrid::surf::NetworkAction *action,
-    simgrid::surf::Action::State statein, simgrid::surf::Action::State stateout)
-{
-  using simgrid::surf::NetworkIBModel;
-  using simgrid::surf::IBNode;
-
-  if(statein!=simgrid::surf::Action::State::running || stateout!=simgrid::surf::Action::State::done)
-    return;
-  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);
+#include "src/surf/network_ib.hpp"
 
-  ((NetworkIBModel*)surf_network_model)->active_comms.erase(action);
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
 
-}
-
-
-static void IB_action_init_callback(
-    simgrid::surf::NetworkAction *action, simgrid::routing::NetCard *src, simgrid::routing::NetCard *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::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 !");
-
-  ibModel->active_comms[action]=std::make_pair(act_src, act_dst);
-
-  ibModel->updateIBfactors(action, act_src, act_dst, 0);
-}
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 
 /*********
  * Model *
@@ -80,160 +30,182 @@ static void IB_action_init_callback(
 /*  month=june, */
 /*  year={2010} */
 /*  } */
-void surf_network_model_init_IB(void)
+void surf_network_model_init_IB()
 {
-  using simgrid::surf::networkActionStateChangedCallbacks;
+  using simgrid::kernel::resource::NetworkIBModel;
 
-  if (surf_network_model)
-    return;
+  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);
 
-  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);
+  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 {
+
+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++;
 }
 
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
+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];
 
-namespace simgrid {
-  namespace surf {
+  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());
 
-    NetworkIBModel::NetworkIBModel()
-    : NetworkSmpiModel() {
-      haveGap_=false;
-      active_nodes=nullptr;
+  ibModel->active_comms[action] = std::make_pair(act_src, act_dst);
+  ibModel->update_IB_factors(action, act_src, act_dst, 0);
+}
 
-      const char* IB_factors_string=xbt_cfg_get_string("smpi/IB-penalty-factors");
-      xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";");
+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(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");
+  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");
 
-      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");
+  try {
+    Be_ = std::stod(radical_elements.front());
+  } catch (const std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("First part of smpi/IB-penalty-factors is not numerical:") + ia.what());
+  }
 
-      xbt_dynar_free(&radical_elements);
-    }
+  try {
+    Bs_ = std::stod(radical_elements.at(1));
+  } catch (const std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Second part of smpi/IB-penalty-factors is not numerical:") + ia.what());
+  }
 
-    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);
+  try {
+    ys_ = std::stod(radical_elements.back());
+  } catch (const std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Third part of smpi/IB-penalty-factors is not numerical:") + ia.what());
+  }
+}
+
+void NetworkIBModel::compute_IB_factors(IBNode* root) const
+{
+  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_) {
+    double my_penalty_out = 1.0;
+
+    if (num_comm_out != 1) {
+      if (comm->destination->nb_active_comms_down_ > 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_;
     }
 
-    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);
-      }
-
-      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->getBound();
-        //save initial rate of the action
-        if((*it)->init_rate==-1)
-          (*it)->init_rate= rate_before_update;
-
-        penalized_bw= ! num_comm_out ? (*it)->init_rate : (*it)->init_rate /penalty;
-
-        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 );
-        }
-
-      }
-      XBT_DEBUG("Finished computing IB penalties");
+    max_penalty_out = std::max(max_penalty_out, my_penalty_out);
+  }
+
+  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)
+      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
+
+    double penalty = std::max(my_penalty_in, max_penalty_out);
+
+    double rate_before_update = comm->action->get_bound();
+    // save initial rate of the action
+    if (comm->init_rate == -1)
+      comm->init_rate = rate_before_update;
+
+    double penalized_bw = num_comm_out ? comm->init_rate / penalty : comm->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_,
+                comm->destination->id_, comm->action, penalized_bw, comm->action->get_bound(), comm->init_rate);
+      get_maxmin_system()->update_variable_bound(comm->action->get_variable(), penalized_bw);
+    } else {
+      XBT_DEBUG("%d->%d action %p penalty not updated : bw %f, initial rate %f", root->id_, comm->destination->id_,
+                comm->action, penalized_bw, comm->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::update_IB_factors_rec(IBNode* root, std::vector<bool>& updatedlist) const
+{
+  if (not updatedlist[root->id_]) {
+    XBT_DEBUG("IB - Updating rec %d", root->id_);
+    compute_IB_factors(root);
+    updatedlist[root->id_] = true;
+    for (ActiveComm const* comm : root->active_comms_up_) {
+      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);
+    }
+  }
+}
 
+void NetworkIBModel::update_IB_factors(NetworkAction* action, IBNode* from, IBNode* to, int remove) const
+{
+  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++;
-      }
-      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);
+  if (remove) {
+    if (to->active_comms_down_[from] == 1)
+      to->active_comms_down_.erase(from);
+    else
+      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_)) {
+      delete *it;
+      from->active_comms_up_.erase(it);
     }
-
+    action->unref();
+  } else {
+    action->ref();
+    auto* comm        = new ActiveComm();
+    comm->action      = action;
+    comm->destination = to;
+    from->active_comms_up_.push_back(comm);
+
+    to->active_comms_down_[from] += 1;
+    to->nb_active_comms_down_++;
   }
+  XBT_DEBUG("IB - Updating %d", from->id_);
+  std::vector<bool> updated(active_nodes.size(), false);
+  update_IB_factors_rec(from, updated);
+  XBT_DEBUG("IB - Finished updating %d", from->id_);
 }
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid