Use enum class for smpi privatization strategies.

[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 b71adc7..54736a6 100644 (file)
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -43,6 +43,7 @@ void smpi_execute_(double *duration)
 }
 
 void smpi_execute_flops(double flops) {
+  xbt_assert(flops >= 0, "You're trying to execute a negative amount of flops (%f)!", flops);
   XBT_DEBUG("Handle real computation time: %f flops", flops);
   smx_activity_t action = simcall_execution_start("computation", flops, 1, 0, smpi_process()->process()->getHost());
   simcall_set_category (action, TRACE_internal_smpi_get_category());
@@ -55,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);
@@ -78,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());
   }
 
@@ -157,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) {
@@ -262,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()));
   }
 };
 
@@ -396,7 +397,6 @@ void smpi_sample_3(int global, const char *file, int line)
   data.benching = false;
 }
 
-extern "C" { /** These functions will be called from the user code **/
 smpi_trace_call_location_t* smpi_trace_get_call_location()
 {
   return smpi_process()->call_location();
@@ -423,7 +423,6 @@ void smpi_trace_set_call_location__(const char* file, int* line)
 {
   smpi_trace_set_call_location(file, *line);
 }
-}
 
 void smpi_bench_destroy()
 {