-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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. */
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());
smpi_bench_begin();
}
+void smpi_execute_flops_benched(double flops) {
+ smpi_bench_end();
+ smpi_execute_flops(flops);
+ smpi_bench_begin();
+}
+
void smpi_bench_begin()
{
if (smpi_cfg_privatization() == SmpiPrivStrategies::MMAP) {
#if HAVE_PAPI
if (not smpi_cfg_papi_events_file().empty() && TRACE_smpi_is_enabled()) {
- container_t container =
+ const simgrid::instr::Container* container =
simgrid::instr::Container::by_name(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::get_pid()));
- papi_counter_t& counter_data = smpi_process()->papi_counters();
+ 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));
auto sample = samples.find(loc);
if (sample == samples.end())
xbt_die("Y U NO use SMPI_SAMPLE_* macros? Stop messing directly with smpi_sample_* functions!");
- LocalData& data = sample->second;
+ const LocalData& data = sample->second;
if (data.benching) {
// we need to run a new bench
xbt_die("Y U NO use SMPI_SAMPLE_* macros? Stop messing directly with smpi_sample_* functions!");
if (smpi_process()->sampling()){//end of loop, but still sampling needed
- LocalData& data = sample->second;
+ const LocalData& data = sample->second;
smpi_process()->set_sampling(0);
smpi_execute(data.mean * iter_count);
smpi_bench_begin();
}
/** Required for Fortran bindings */
-void smpi_trace_set_call_location_(const char* file, int* line)
+void smpi_trace_set_call_location_(const char* file, const int* line)
{
smpi_trace_set_call_location(file, *line);
}
/** Required for Fortran if -fsecond-underscore is activated */
-void smpi_trace_set_call_location__(const char* file, int* line)
+void smpi_trace_set_call_location__(const char* file, const int* line)
{
smpi_trace_set_call_location(file, *line);
}