X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c1bf2b26c5a3aa0d8c29674dc12993e7c0de15..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 7d7c3249a9..a6335848b3 100644
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -1,24 +1,22 @@
-/* Copyright (c) 2014-2017. 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 "simgrid/sg_config.h"
-#include "src/surf/HostImpl.hpp"
-#include "src/surf/maxmin_private.hpp"
 #include "src/surf/network_ib.hpp"
+#include "simgrid/sg_config.hpp"
+#include "src/surf/HostImpl.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
@@ -26,15 +24,15 @@ static void IB_create_host_callback(simgrid::s4u::Host& host){
   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)
 {
-  using simgrid::surf::NetworkIBModel;
-  using simgrid::surf::IBNode;
+  using simgrid::kernel::resource::IBNode;
+  using simgrid::kernel::resource::NetworkIBModel;
 
-  if (action->getState() != 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);
@@ -45,25 +43,25 @@ static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* actio
 
 }
 
-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);
@@ -90,21 +88,21 @@ void surf_network_model_init_IB()
   if (surf_network_model)
     return;
 
-  surf_network_model = new simgrid::surf::NetworkIBModel();
+  surf_network_model = new simgrid::kernel::resource::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);
-
+  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()
 {
-  const char* IB_factors_string = xbt_cfg_get_string("smpi/IB-penalty-factors");
+  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(";"));
 
@@ -164,7 +162,7 @@ void NetworkIBModel::computeIBfactors(IBNode* root)
 
     double penalty = std::max(my_penalty_in, max_penalty_out);
 
-    double rate_before_update = (*it)->action->getBound();
+    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;
@@ -173,8 +171,8 @@ void NetworkIBModel::computeIBfactors(IBNode* root)
 
     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->getBound(), (*it)->init_rate);
-      lmm_update_variable_bound(maxminSystem_, (*it)->action->getVariable(), penalized_bw);
+                (*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);
@@ -183,18 +181,18 @@ void NetworkIBModel::computeIBfactors(IBNode* root)
   XBT_DEBUG("Finished computing IB penalties");
 }
 
-void NetworkIBModel::updateIBfactors_rec(IBNode* root, bool* updatedlist)
+void NetworkIBModel::updateIBfactors_rec(IBNode* root, std::vector<bool>& updatedlist)
 {
-  if (updatedlist[root->id] == 0) {
+  if (not updatedlist[root->id]) {
     XBT_DEBUG("IB - Updating rec %d", root->id);
     computeIBfactors(root);
-    updatedlist[root->id] = 1;
+    updatedlist[root->id] = true;
     for (std::vector<ActiveComm*>::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
-      if (updatedlist[(*it)->destination->id] != 1)
+      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 (updatedlist[it->first->id] != 1)
+      if (not updatedlist[it->first->id])
         updateIBfactors_rec(it->first, updatedlist);
     }
   }
@@ -205,7 +203,6 @@ void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode
   if (from == to) // disregard local comms (should use loopback)
     return;
 
-  bool* updated    = (bool*)xbt_malloc0(active_nodes.size() * sizeof(bool));
   ActiveComm* comm = nullptr;
   if (remove) {
     if (to->ActiveCommsDown[from] == 1)
@@ -233,11 +230,11 @@ void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode
     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);
-  if (comm)
-    delete comm;
-  xbt_free(updated);
+  delete comm;
 }
 }
 }
+} // namespace simgrid