From: Mark Stillwell <marklee@fortawesome.org>
Date: Mon, 28 Nov 2011 12:17:01 +0000 (+0100)
Subject: updates to smpi_bench and added smpi_calibration
X-Git-Tag: exp_20120216~195^2~18
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/257a3f5cec44f5ff92b998a2cccb4b32113552a1?hp=65524ea02277d920b22ee6c1f29ec198e620ca20

updates to smpi_bench and added smpi_calibration
---

diff --git a/contrib/network_model/smpi_calibration.c b/contrib/network_model/smpi_calibration.c
index 1d6e86375b..fd67750523 100644
--- a/contrib/network_model/smpi_calibration.c
+++ b/contrib/network_model/smpi_calibration.c
@@ -1,7 +1,7 @@
 /**--------- <copy/paste C code snippet in surf/network.c> -------------
   * produced by:
-  * ./regression2.py ./pingpong-in.dat 0.15 100 2 2.4e-5 1.25e8
-  * outliers: 65
+  * ./regression2.py ./pingpong-in.dat 0.15 30 2 2.4e-5 1.25e8
+  * outliers: 66
   * gnuplot: 
     plot "./pingpong-in.dat" using 1:2 with lines title "data", \
         (x >= 65472) ? 0.00850436*x+558.894 : \
@@ -12,7 +12,9 @@
         (x >= 1426) ? 0.0131384*x+77.3159 : \
         (x >= 732) ? 0.0233927*x+93.6146 : \
         (x >= 257) ? 0.0236608*x+93.7637 : \
-        (x >= 0) ? 0.00985119*x+96.704 : \
+        (x >= 127) ? 0.0246645*x+94.0447 : \
+        (x >= 64) ? 0.037963*x+93.0877 : \
+        (x >= 0) ? 2.22507e-308*x+98.0633 : \
         1.0 with lines title "piecewise function"
   *-------------------------------------------------------------------*/
 
@@ -27,7 +29,9 @@ static double smpi_bandwidth_factor(double size)
     if (size >= 1426) return 0.608902;
     if (size >= 732) return 0.341987;
     if (size >= 257) return 0.338112;
-    if (size >= 0) return 0.812084;
+    if (size >= 127) return 0.324353;
+    if (size >= 64) return 0.210731;
+    if (size >= 0) return 3.59539e+305;
     return 1.0;
 }
 
@@ -42,7 +46,9 @@ static double smpi_latency_factor(double size)
     if (size >= 1426) return 1.61075;
     if (size >= 732) return 1.9503;
     if (size >= 257) return 1.95341;
-    if (size >= 0) return 2.01467;
+    if (size >= 127) return 1.95926;
+    if (size >= 64) return 1.93933;
+    if (size >= 0) return 2.04299;
     return 1.0;
 }
 
diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 6cad02ee91..363381559f 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -171,7 +171,9 @@ void smpi_bench_end(void)
 
 unsigned int smpi_sleep(unsigned int secs)
 {
+  smpi_bench_end();
   smpi_execute((double) secs);
+  smpi_bench_begin();
   return secs;
 }