Merge branch 'master' of https://framagit.org/simgrid/simgrid

[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 9c641fb..0b04777 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,19 +11,18 @@
 #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"
-#include <unordered_map>
 
-#ifndef WIN32
-#include <sys/mman.h>
-#endif
 #include <cerrno>
 #include <cmath>
+#include <sys/mman.h>
+#include <unordered_map>
 
 #if HAVE_PAPI
 #include <papi.h>
@@ -211,7 +209,7 @@ int smpi_gettimeofday(struct timeval* tv, struct timezone* tz)
     double secs  = trunc(now);
     double usecs = (now - secs) * 1e6;
     tv->tv_sec   = static_cast<time_t>(secs);
-    tv->tv_usec  = static_cast<decltype(tv->tv_usec)>(usecs); // suseconds_t (or useconds_t on WIN32)
+    tv->tv_usec  = static_cast<decltype(tv->tv_usec)>(usecs); // suseconds_t
   }
   if (smpi_wtime_sleep > 0)
     simgrid::s4u::this_actor::sleep_for(smpi_wtime_sleep);
@@ -258,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 ************************************/
@@ -422,7 +420,7 @@ smpi_trace_call_location_t* smpi_trace_get_call_location()
   return smpi_process()->call_location();
 }
 
-void smpi_trace_set_call_location(const char* file, const int line)
+void smpi_trace_set_call_location(const char* file, const int line, const char* call_name)
 {
   smpi_trace_call_location_t* loc = smpi_process()->call_location();
 
@@ -433,18 +431,19 @@ void smpi_trace_set_call_location(const char* file, const int line)
   else
     loc->filename = file;
   loc->linenumber = line;
+  loc->func_call  = call_name;
 }
 
 /** Required for Fortran bindings */
-void smpi_trace_set_call_location_(const char* file, const int* line)
+void smpi_trace_set_call_location_(const char* file, const int* line, const char* call_name)
 {
-  smpi_trace_set_call_location(file, *line);
+  smpi_trace_set_call_location(file, *line, call_name);
 }
 
 /** Required for Fortran if -fsecond-underscore is activated */
-void smpi_trace_set_call_location__(const char* file, const int* line)
+void smpi_trace_set_call_location__(const char* file, const int* line, const char* call_name)
 {
-  smpi_trace_set_call_location(file, *line);
+  smpi_trace_set_call_location(file, *line, call_name);
 }
 
 void smpi_bench_destroy()