Merge branch 'udpor-phase6' into 'master'

[simgrid.git] / src / smpi / internals / smpi_bench.cpp

diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp
index 520cd14..d79504f 100644 (file)
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -3,7 +3,6 @@
 /* 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 "getopt.h"
 #include "private.hpp"
 #include "simgrid/host.h"
 #include "simgrid/modelchecker.h"
@@ -12,10 +11,11 @@
 #include "smpi_comm.hpp"
 #include "smpi_utils.hpp"
 #include "src/internal_config.h"
+#include "src/kernel/lmm/System.hpp" // sg_precision_timing
 #include "src/mc/mc_replay.hpp"
-#include "src/surf/surf_interface.hpp" // sg_surf_precision
 #include "xbt/config.hpp"
 #include "xbt/file.hpp"
+#include <getopt.h>
 
 #include "src/smpi/include/smpi_actor.hpp"
 
@@ -256,13 +256,13 @@ double smpi_mpi_wtime()
 unsigned long long smpi_rastro_resolution ()
 {
   const SmpiBenchGuard suspend_bench;
-  return static_cast<unsigned long long>(1.0 / sg_surf_precision);
+  return static_cast<unsigned long long>(1.0 / sg_precision_timing);
 }
 
 unsigned long long smpi_rastro_timestamp ()
 {
   const SmpiBenchGuard suspend_bench;
-  return static_cast<unsigned long long>(simgrid::s4u::Engine::get_clock() / sg_surf_precision);
+  return static_cast<unsigned long long>(simgrid::s4u::Engine::get_clock() / sg_precision_timing);
 }
 
 /* ****************************** Functions related to the SMPI_SAMPLE_ macros ************************************/