From: Augustin Degomme <adegomme@gmail.com>
Date: Wed, 3 Mar 2021 19:22:09 +0000 (+0100)
Subject: PAPI tracing was broken with latest instr changes.
X-Git-Tag: v3.27~259
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f3dbf0ab1a2d22f02a76bc2fa5e5840eb9a25779

PAPI tracing was broken with latest instr changes.
Expected because it's not tested.
---

diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp
index 27956e9b3b..6ce0054fa1 100644
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -158,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) {
-      auto* 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