X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1a78c26e5680e8f8544aa8af5570d90a0d818c7..30aca4d4af004d1ec899d12f0a9fe3997e9be15e:/src/surf/network_smpi.cpp

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index 3575a83c38..dedd899ae5 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,12 +49,13 @@ 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);
     }
 
@@ -134,12 +127,12 @@ namespace simgrid {
       double current=1.0;
       for (auto fact: smpi_bw_factor) {
         if (size <= fact.factor) {
-          XBT_DEBUG("%f <= %ld return %f", size, fact.factor, current);
+          XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
           return current;
         }else
           current=fact.values.front();
       }
-      XBT_DEBUG("%f > %ld return %f", size, smpi_bw_factor.back().factor, current);
+      XBT_DEBUG("%f > %zu return %f", size, smpi_bw_factor.back().factor, current);
 
       return current;
     }
@@ -152,12 +145,12 @@ namespace simgrid {
       double current=1.0;
       for (auto fact: smpi_lat_factor) {
         if (size <= fact.factor) {
-          XBT_DEBUG("%f <= %ld return %f", size, fact.factor, current);
+          XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
           return current;
         }else
           current=fact.values.front();
       }
-      XBT_DEBUG("%f > %ld return %f", size, smpi_lat_factor.back().factor, current);
+      XBT_DEBUG("%f > %zu return %f", size, smpi_lat_factor.back().factor, current);
 
       return current;
     }