X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f84aecd6adbd11b2e31a6cd47016bc03aa778a6e..a900ac9d39fee1b3de240499c5326e5b8d4f44c2:/src/smpi/internals/smpi_bench.cpp diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index ea22f3afa1..54736a67be 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -56,7 +56,7 @@ void smpi_execute(double duration) if (duration >= smpi_cpu_threshold) { XBT_DEBUG("Sleep for %g to handle real computation time", duration); double flops = duration * smpi_host_speed; - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_computing_in(rank, flops); smpi_execute_flops(flops); @@ -79,7 +79,7 @@ void smpi_execute_benched(double duration) void smpi_bench_begin() { - if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { + if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) { smpi_switch_data_segment(simgrid::s4u::Actor::self()); } @@ -158,7 +158,7 @@ void smpi_bench_end() #if HAVE_PAPI if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) { container_t container = - new simgrid::instr::Container(std::string("rank-") + std::to_string(simgrid::s4u::Actor::self()->getPid())); + new simgrid::instr::Container(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::getPid)); papi_counter_t& counter_data = smpi_process()->papi_counters(); for (auto const& pair : counter_data) { @@ -263,7 +263,7 @@ public: SampleLocation(bool global, const char* file, int line) : std::string(std::string(file) + ":" + std::to_string(line)) { if (not global) - this->append(":" + std::to_string(simgrid::s4u::Actor::self()->getPid())); + this->append(":" + std::to_string(simgrid::s4u::this_actor::getPid())); } };