X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55311bd63d3b77f71f141b26eca381941ec3da15..ab319b7200020e1280da137a8c77bf57b2588714:/src/surf/network_smpi.cpp

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index 08e8f8be09..6d0e8ffc7f 100644
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -20,14 +20,6 @@ std::vector<s_smpi_factor_t> smpi_lat_factor;
 
 xbt_dict_t gap_lookup = nullptr;
 
-static int factor_cmp(const void *pa, const void *pb)
-{
-  return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor) ? 1 :
-      (((s_smpi_factor_t*)pa)->factor < ((s_smpi_factor_t*)pb)->factor) ? -1 : 0;
-}
-
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-
 /*********
  * Model *
  *********/
@@ -57,18 +49,19 @@ void surf_network_model_init_SMPI()
 namespace simgrid {
   namespace surf {
 
-    NetworkSmpiModel::NetworkSmpiModel()
-    : NetworkCm02Model() {
-      haveGap_=true;
+  NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
+  {
+    haveGap_ = true;
     }
 
-    NetworkSmpiModel::~NetworkSmpiModel(){
+    NetworkSmpiModel::~NetworkSmpiModel()
+    {
       xbt_dict_free(&gap_lookup);
     }
 
-    void NetworkSmpiModel::gapAppend(double size, Link* link, NetworkAction *act)
+    void NetworkSmpiModel::gapAppend(double size, LinkImpl* link, NetworkAction* act)
     {
-      const char *src = link->getName();
+      const char* src = link->cname();
       xbt_fifo_t fifo;
       NetworkCm02Action *action= static_cast<NetworkCm02Action*>(act);
 
@@ -104,17 +97,12 @@ namespace simgrid {
 
     void NetworkSmpiModel::gapRemove(Action *lmm_action)
     {
-      xbt_fifo_t fifo;
-      size_t size;
       NetworkCm02Action *action = static_cast<NetworkCm02Action*>(lmm_action);
 
-      if (sg_sender_gap > 0.0 && action->senderLinkName_
-          && action->senderFifoItem_) {
-        fifo =
-            (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup,
-                action->senderLinkName_);
+      if (sg_sender_gap > 0.0 && action->senderLinkName_ && action->senderFifoItem_) {
+        xbt_fifo_t fifo = (xbt_fifo_t)xbt_dict_get_or_null(gap_lookup, action->senderLinkName_);
         xbt_fifo_remove_item(fifo, action->senderFifoItem_);
-        size = xbt_fifo_size(fifo);
+        size_t size = xbt_fifo_size(fifo);
         if (size == 0) {
           xbt_fifo_free(fifo);
           xbt_dict_remove(gap_lookup, action->senderLinkName_);
@@ -131,13 +119,13 @@ namespace simgrid {
       if (smpi_bw_factor.empty())
         smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor"));
 
-      double current=1.0;
-      for (auto fact: smpi_bw_factor) {
+      double current = 1.0;
+      for (const auto& fact : smpi_bw_factor) {
         if (size <= fact.factor) {
           XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
           return current;
-        }else
-          current=fact.values.front();
+        } else
+          current = fact.values.front();
       }
       XBT_DEBUG("%f > %zu return %f", size, smpi_bw_factor.back().factor, current);
 
@@ -150,7 +138,7 @@ namespace simgrid {
         smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor"));
 
       double current=1.0;
-      for (auto fact: smpi_lat_factor) {
+      for (const auto& fact : smpi_lat_factor) {
         if (size <= fact.factor) {
           XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
           return current;