From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 27 Nov 2017 19:29:27 +0000 (+0100)
Subject: Merge branch 'master' of github.com:simgrid/simgrid
X-Git-Tag: v3.18~228
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5d2730ebe780871aad000c557cbe4e8f414a0134?hp=97112b1dcc05320884f3027e156d101e1a56a6a1

Merge branch 'master' of github.com:simgrid/simgrid
---

diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp
index 795521e695..21fe9740d2 100644
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -6,6 +6,7 @@
 #include "private.hpp"
 #include "simgrid/modelchecker.h"
 #include "smpi_comm.hpp"
+#include "simgrid/host.h"
 #include "smpi_process.hpp"
 #include "src/internal_config.h"
 #include "src/mc/mc_replay.hpp"
@@ -69,7 +70,8 @@ void smpi_execute(double duration)
 void smpi_execute_benched(double duration)
 {
   smpi_bench_end();
-  smpi_execute(duration);
+  double speed = sg_host_speed(sg_host_self());
+  smpi_execute_flops(duration*speed);
   smpi_bench_begin();
 }