Define class SmpiBenchGuard, and use RAII to handle smpi_bench_end()/smpi_bench_begin().

[simgrid.git] / src / smpi / plugins / ampi / ampi.cpp

diff --git a/src/smpi/plugins/ampi/ampi.cpp b/src/smpi/plugins/ampi/ampi.cpp
index 24e64ea1825692d9826d56023f97bdc9f231251f..10cf2a20501e8aab238a86c004bd6aacd0160fce 100644 (file)
--- a/src/smpi/plugins/ampi/ampi.cpp
+++ b/src/smpi/plugins/ampi/ampi.cpp
@@ -1,9 +1,8 @@
-/* Copyright (c) 2018-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-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. */
 
-#include <simgrid/plugins/load_balancer.h>
 #include <simgrid/s4u/Actor.hpp>
 #include <src/instr/instr_smpi.hpp>
 #include <src/smpi/include/smpi_actor.hpp>
@@ -31,7 +30,7 @@ extern "C" void* _sampi_malloc(size_t size)
 extern "C" void _sampi_free(void* ptr)
 {
   size_t alloc_size = alloc_table.at(ptr);
-  int my_proc_id    = simgrid::s4u::this_actor::get_pid();
+  aid_t my_proc_id  = simgrid::s4u::this_actor::get_pid();
   memory_size[my_proc_id] -= alloc_size;
   xbt_free(ptr);
 }
@@ -48,7 +47,7 @@ extern "C" void* _sampi_calloc(size_t num_elm, size_t elem_size)
 extern "C" void* _sampi_realloc(void* ptr, size_t size)
 {
   void* result = xbt_realloc(ptr, size);
-  int old_size = alloc_table.at(ptr);
+  size_t old_size = alloc_table.at(ptr);
   alloc_table.erase(ptr);
   alloc_table.insert({result, size});
   if (not simgrid::s4u::this_actor::is_maestro()) {
@@ -75,26 +74,23 @@ xbt::signal<void(s4u::Actor const&)> on_iteration_out;
  */
 int APMPI_Iteration_in(MPI_Comm comm)
 {
-  smpi_bench_end();
+  const SmpiBenchGuard suspend_bench;
   TRACE_Iteration_in(comm->rank() + 1, new simgrid::instr::NoOpTIData("iteration_in")); // implemented on instr_smpi.c
-  smpi_bench_begin();
   return 1;
 }
 
 int APMPI_Iteration_out(MPI_Comm comm)
 {
-  smpi_bench_end();
+  const SmpiBenchGuard suspend_bench;
   TRACE_Iteration_out(comm->rank() + 1, new simgrid::instr::NoOpTIData("iteration_out"));
-  smpi_bench_begin();
   return 1;
 }
 
 void APMPI_Migrate(MPI_Comm comm)
 {
-  smpi_bench_end();
-  int my_proc_id = simgrid::s4u::this_actor::get_pid();
+  const SmpiBenchGuard suspend_bench;
+  aid_t my_proc_id = simgrid::s4u::this_actor::get_pid();
   TRACE_migration_call(comm->rank() + 1, new simgrid::instr::AmpiMigrateTIData(memory_size[my_proc_id]));
-  smpi_bench_begin();
 }
 
 int AMPI_Iteration_in(MPI_Comm comm)