[SMPI] Replay: Remove local variables from action_reducescatter

[simgrid.git] / src / smpi / internals / smpi_replay.cpp

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index 2230e6f..db6dd83 100644 (file)
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -12,11 +12,10 @@
 #include "smpi_request.hpp"
 #include "xbt/replay.hpp"
 
+#include <numeric>
 #include <unordered_map>
 #include <vector>
 
-#define KEY_SIZE (sizeof(int) * 2 + 1)
-
 using simgrid::s4u::Actor;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI");
@@ -95,31 +94,30 @@ static MPI_Datatype decode_datatype(const char *const action)
 {
   switch(atoi(action)) {
     case 0:
-      MPI_CURRENT_TYPE=MPI_DOUBLE;
+      return MPI_DOUBLE;
       break;
     case 1:
-      MPI_CURRENT_TYPE=MPI_INT;
+      return MPI_INT;
       break;
     case 2:
-      MPI_CURRENT_TYPE=MPI_CHAR;
+      return MPI_CHAR;
       break;
     case 3:
-      MPI_CURRENT_TYPE=MPI_SHORT;
+      return MPI_SHORT;
       break;
     case 4:
-      MPI_CURRENT_TYPE=MPI_LONG;
+      return MPI_LONG;
       break;
     case 5:
-      MPI_CURRENT_TYPE=MPI_FLOAT;
+      return MPI_FLOAT;
       break;
     case 6:
-      MPI_CURRENT_TYPE=MPI_BYTE;
+      return MPI_BYTE;
       break;
     default:
-      MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE;
+      return MPI_DEFAULT_TYPE;
       break;
   }
-   return MPI_CURRENT_TYPE;
 }
 
 const char* encode_datatype(MPI_Datatype datatype)
@@ -423,8 +421,6 @@ static void action_bcast(const char *const *action)
   double clock = smpi_process()->simulated_elapsed();
   int root     = (action[3]) ? atoi(action[3]) : 0;
   /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */
-  MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
-
   MPI_CURRENT_TYPE = (action[3] && action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
@@ -693,17 +689,14 @@ static void action_reducescatter(const char *const *action) {
   int comm_size = MPI_COMM_WORLD->size();
   CHECK_ACTION_PARAMS(action, comm_size+1, 1)
   int comp_size = parse_double(action[2+comm_size]);
-  int recvcounts[comm_size];
   int my_proc_id                     = Actor::self()->getPid();
-  int size = 0;
   std::vector<int>* trace_recvcounts = new std::vector<int>;
   MPI_CURRENT_TYPE = (action[3 + comm_size]) ? decode_datatype(action[3 + comm_size]) : MPI_DEFAULT_TYPE;
 
   for(int i=0;i<comm_size;i++) {
-    recvcounts[i] = atoi(action[i+2]);
-    trace_recvcounts->push_back(recvcounts[i]);
-    size+=recvcounts[i];
+    trace_recvcounts->push_back(atoi(action[i + 2]));
   }
+  int size{std::accumulate(trace_recvcounts->begin(), trace_recvcounts->end(), 0)};
 
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts,
@@ -713,7 +706,7 @@ static void action_reducescatter(const char *const *action) {
   void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size());
   void *recvbuf = smpi_get_tmp_recvbuffer(size* MPI_CURRENT_TYPE->size());
 
-  Colls::reduce_scatter(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
+  Colls::reduce_scatter(sendbuf, recvbuf, trace_recvcounts->data(), MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
   TRACE_smpi_comm_out(my_proc_id);