PAPI tracing was broken with latest instr changes.

[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 6eb4ab1..6ce0054 100644 (file)
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -20,6 +20,7 @@
 #ifndef WIN32
 #include <sys/mman.h>
 #endif
+#include <cerrno>
 #include <cmath>
 
 #if HAVE_PAPI
@@ -47,27 +48,16 @@ void private_execute_flops(double flops) {
   smpi_switch_data_segment(simgrid::s4u::Actor::self());
 }
 
-void smpi_execute_flops(double flops) {
-  int rank     = simgrid::s4u::this_actor::get_pid();
-  TRACE_smpi_computing_in(rank, flops);
-
+void smpi_execute_flops(double flops)
+{
   private_execute_flops(flops);
-
-  TRACE_smpi_computing_out(rank);
 }
 
 void smpi_execute(double duration)
 {
   if (duration >= smpi_cfg_cpu_thresh()) {
     XBT_DEBUG("Sleep for %g to handle real computation time", duration);
-    double flops = duration * smpi_cfg_host_speed();
-    int rank     = simgrid::s4u::this_actor::get_pid();
-    TRACE_smpi_computing_in(rank, flops);
-
-    private_execute_flops(flops);
-
-    TRACE_smpi_computing_out(rank);
-
+    private_execute_flops(duration * smpi_cfg_host_speed());
   } else {
     XBT_DEBUG("Real computation took %g while option smpi/cpu-threshold is set to %g => ignore it", duration,
               smpi_cfg_cpu_thresh());
@@ -77,7 +67,7 @@ void smpi_execute(double duration)
 void smpi_execute_benched(double duration)
 {
   smpi_bench_end();
-  double speed = sg_host_speed(sg_host_self());
+  double speed = sg_host_get_speed(sg_host_self());
   smpi_execute_flops(duration*speed);
   smpi_bench_begin();
 }
@@ -114,7 +104,7 @@ void smpi_bench_begin()
 double smpi_adjust_comp_speed(){
   double speedup=1;
   if (smpi_cfg_comp_adjustment_file()[0] != '\0') {
-    smpi_trace_call_location_t* loc                            = smpi_process()->call_location();
+    const smpi_trace_call_location_t* loc                      = smpi_process()->call_location();
     std::string key                                            = loc->get_composed_key();
     std::unordered_map<std::string, double>::const_iterator it = location2speedup.find(key);
     if (it != location2speedup.end()) {
@@ -140,7 +130,7 @@ void smpi_bench_end()
   if (not smpi_cfg_papi_events_file().empty()) {
     papi_counter_t& counter_data        = smpi_process()->papi_counters();
     int event_set                       = smpi_process()->papi_event_set();
-    std::vector<long long> event_values = std::vector<long long>(counter_data.size());
+    std::vector<long long> event_values(counter_data.size());
 
     if (PAPI_stop(event_set, &event_values[0]) != PAPI_OK) { // Error
       XBT_CRITICAL("Could not stop PAPI counters.\n");
@@ -155,7 +145,7 @@ void smpi_bench_end()
 
   if (smpi_process()->sampling()) {
     XBT_CRITICAL("Cannot do recursive benchmarks.");
-    XBT_CRITICAL("Are you trying to make a call to MPI within a SMPI_SAMPLE_ block?");
+    XBT_CRITICAL("Are you trying to make a call to MPI within an SMPI_SAMPLE_ block?");
     xbt_backtrace_display_current();
     xbt_die("Aborting.");
   }
@@ -168,13 +158,12 @@ void smpi_bench_end()
 
 #if HAVE_PAPI
   if (not smpi_cfg_papi_events_file().empty() && TRACE_smpi_is_enabled()) {
-    const simgrid::instr::Container* container =
+    simgrid::instr::Container* container =
         simgrid::instr::Container::by_name(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::get_pid()));
     const papi_counter_t& counter_data = smpi_process()->papi_counters();
 
     for (auto const& pair : counter_data) {
-      simgrid::instr::VariableType* variable = static_cast<simgrid::instr::VariableType*>(container->type_->by_name(pair.first));
-      variable->set_event(SIMIX_get_clock(), pair.second);
+      container->get_variable(pair.first)->set_event(SIMIX_get_clock(), pair.second);
     }
   }
 #endif
@@ -246,15 +235,17 @@ int smpi_gettimeofday(struct timeval* tv, struct timezone* tz)
 #if _POSIX_TIMERS > 0
 int smpi_clock_gettime(clockid_t clk_id, struct timespec* tp)
 {
+  if (not tp) {
+    errno = EFAULT;
+    return -1;
+  }
   if (not smpi_process())
     return clock_gettime(clk_id, tp);
   //there is only one time in SMPI, so clk_id is ignored.
   smpi_bench_end();
   double now = SIMIX_get_clock();
-  if (tp) {
-    tp->tv_sec = static_cast<time_t>(now);
-    tp->tv_nsec = static_cast<long int>((now - tp->tv_sec) * 1e9);
-  }
+  tp->tv_sec  = static_cast<time_t>(now);
+  tp->tv_nsec = static_cast<long int>((now - tp->tv_sec) * 1e9);
   if (smpi_wtime_sleep > 0)
     simgrid::s4u::this_actor::sleep_for(smpi_wtime_sleep);
   smpi_bench_begin();
@@ -291,10 +282,10 @@ unsigned long long smpi_rastro_timestamp ()
   smpi_bench_end();
   double now = SIMIX_get_clock();
 
-  unsigned long long sec = static_cast<unsigned long long>(now);
+  auto sec               = static_cast<unsigned long long>(now);
   unsigned long long pre = (now - sec) * smpi_rastro_resolution();
   smpi_bench_begin();
-  return static_cast<unsigned long long>(sec) * smpi_rastro_resolution() + pre;
+  return sec * smpi_rastro_resolution() + pre;
 }
 
 /* ****************************** Functions related to the SMPI_SAMPLE_ macros ************************************/