X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1e141180960ef6c943d48c19fa9c4e114813db0..fc6f9c6d91e16fedad411f4e0c403d2174af735a:/src/smpi/internals/smpi_replay.cpp

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index bfd780e599..676685c42a 100644
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -12,26 +12,35 @@
 #include "smpi_request.hpp"
 #include "xbt/replay.hpp"
 
+#include <memory>
+#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");
 
-int communicator_size = 0;
-static int active_processes = 0;
-std::unordered_map<int,std::vector<MPI_Request>*> reqq;
+static int communicator_size = 0;
+static int active_processes  = 0;
+static std::unordered_map<int, std::vector<MPI_Request>*> reqq;
+
+static MPI_Datatype MPI_DEFAULT_TYPE;
 
-MPI_Datatype MPI_DEFAULT_TYPE;
-MPI_Datatype MPI_CURRENT_TYPE;
+#define CHECK_ACTION_PARAMS(action, mandatory, optional) {\
+    int i=0;\
+    while(action[i]!=nullptr)\
+     i++;\
+    if(i<mandatory+2)                                           \
+    THROWF(arg_error, 0, "%s replay failed.\n" \
+          "%d items were given on the line. First two should be process_id and action.  " \
+          "This action needs after them %d mandatory arguments, and accepts %d optional ones. \n" \
+          "Please contact the Simgrid team if support is needed", __FUNCTION__, i, mandatory, optional);\
+  }
 
-static int sendbuffer_size=0;
-char* sendbuffer=nullptr;
-static int recvbuffer_size=0;
-char* recvbuffer=nullptr;
+class ReplayActionArg {
+  ReplayActionArg() {}
+};
 
 static void log_timed_action (const char *const *action, double clock){
   if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
@@ -51,34 +60,6 @@ static void set_reqq_self(std::vector<MPI_Request> *mpi_request)
    reqq.insert({Actor::self()->getPid(), mpi_request});
 }
 
-//allocate a single buffer for all sends, growing it if needed
-void* smpi_get_tmp_sendbuffer(int size)
-{
-  if (not smpi_process()->replaying())
-    return xbt_malloc(size);
-  if (sendbuffer_size<size){
-    sendbuffer=static_cast<char*>(xbt_realloc(sendbuffer,size));
-    sendbuffer_size=size;
-  }
-  return sendbuffer;
-}
-
-//allocate a single buffer for all recv
-void* smpi_get_tmp_recvbuffer(int size){
-  if (not smpi_process()->replaying())
-    return xbt_malloc(size);
-  if (recvbuffer_size<size){
-    recvbuffer=static_cast<char*>(xbt_realloc(recvbuffer,size));
-    recvbuffer_size=size;
-  }
-  return recvbuffer;
-}
-
-void smpi_free_tmp_buffer(void* buf){
-  if (not smpi_process()->replaying())
-    xbt_free(buf);
-}
-
 /* Helper function */
 static double parse_double(const char *string)
 {
@@ -93,66 +74,16 @@ static double parse_double(const char *string)
 //TODO: this logic should be moved inside the datatype class, to support all predefined types and get rid of is_replayable.
 static MPI_Datatype decode_datatype(const char *const action)
 {
-  switch(atoi(action)) {
-    case 0:
-      MPI_CURRENT_TYPE=MPI_DOUBLE;
-      break;
-    case 1:
-      MPI_CURRENT_TYPE=MPI_INT;
-      break;
-    case 2:
-      MPI_CURRENT_TYPE=MPI_CHAR;
-      break;
-    case 3:
-      MPI_CURRENT_TYPE=MPI_SHORT;
-      break;
-    case 4:
-      MPI_CURRENT_TYPE=MPI_LONG;
-      break;
-    case 5:
-      MPI_CURRENT_TYPE=MPI_FLOAT;
-      break;
-    case 6:
-      MPI_CURRENT_TYPE=MPI_BYTE;
-      break;
-    default:
-      MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE;
-      break;
-  }
-   return MPI_CURRENT_TYPE;
+  return simgrid::smpi::Datatype::decode(action);
 }
 
 const char* encode_datatype(MPI_Datatype datatype)
 {
-  if (datatype==MPI_BYTE)
-      return "";
-  if(datatype==MPI_DOUBLE)
-      return "0";
-  if(datatype==MPI_INT)
-      return "1";
-  if(datatype==MPI_CHAR)
-      return "2";
-  if(datatype==MPI_SHORT)
-      return "3";
-  if(datatype==MPI_LONG)
-    return "4";
-  if(datatype==MPI_FLOAT)
-      return "5";
-  // default - not implemented.
-  // do not warn here as we pass in this function even for other trace formats
-  return "-1";
-}
+  if (datatype == nullptr) /* this actually does seem to be possible, had this in the scatter2 test */
+    return "-1";
 
-#define CHECK_ACTION_PARAMS(action, mandatory, optional) {\
-    int i=0;\
-    while(action[i]!=nullptr)\
-     i++;\
-    if(i<mandatory+2)                                           \
-    THROWF(arg_error, 0, "%s replay failed.\n" \
-          "%d items were given on the line. First two should be process_id and action.  " \
-          "This action needs after them %d mandatory arguments, and accepts %d optional ones. \n" \
-          "Please contact the Simgrid team if support is needed", __FUNCTION__, i, mandatory, optional);\
-  }
+  return datatype->encode();
+}
 
 namespace simgrid {
 namespace smpi {
@@ -212,22 +143,19 @@ static void action_compute(const char *const *action)
 static void action_send(const char *const *action)
 {
   CHECK_ACTION_PARAMS(action, 2, 1)
-  int to = atoi(action[2]);
+  int to       = std::stoi(action[2]);
   double size=parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
 
-  if(action[4])
-    MPI_CURRENT_TYPE=decode_datatype(action[4]);
-  else
-    MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid();
 
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                     new simgrid::instr::Pt2PtTIData("send", to, size, encode_datatype(MPI_CURRENT_TYPE)));
+                     new simgrid::instr::Pt2PtTIData("send", to, size, MPI_CURRENT_TYPE->encode()));
   if (not TRACE_smpi_view_internals())
-    TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
+    TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size());
 
   Request::send(nullptr, size, MPI_CURRENT_TYPE, to , 0, MPI_COMM_WORLD);
 
@@ -239,21 +167,18 @@ static void action_send(const char *const *action)
 static void action_Isend(const char *const *action)
 {
   CHECK_ACTION_PARAMS(action, 2, 1)
-  int to = atoi(action[2]);
+  int to       = std::stoi(action[2]);
   double size=parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
 
-  if(action[4])
-    MPI_CURRENT_TYPE=decode_datatype(action[4]);
-  else
-    MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                     new simgrid::instr::Pt2PtTIData("Isend", to, size, encode_datatype(MPI_CURRENT_TYPE)));
+                     new simgrid::instr::Pt2PtTIData("Isend", to, size, MPI_CURRENT_TYPE->encode()));
   if (not TRACE_smpi_view_internals())
-    TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
+    TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size * MPI_CURRENT_TYPE->size());
 
   MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0, MPI_COMM_WORLD);
 
@@ -266,21 +191,18 @@ static void action_Isend(const char *const *action)
 
 static void action_recv(const char *const *action) {
   CHECK_ACTION_PARAMS(action, 2, 1)
-  int from = atoi(action[2]);
+  int from     = std::stoi(action[2]);
   double size=parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
   MPI_Status status;
 
-  if(action[4])
-    MPI_CURRENT_TYPE=decode_datatype(action[4]);
-  else
-    MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   int src_traced = MPI_COMM_WORLD->group()->actor(from)->getPid();
 
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                     new simgrid::instr::Pt2PtTIData("recv", from, size, encode_datatype(MPI_CURRENT_TYPE)));
+                     new simgrid::instr::Pt2PtTIData("recv", from, size, MPI_CURRENT_TYPE->encode()));
 
   //unknown size from the receiver point of view
   if (size <= 0.0) {
@@ -301,18 +223,15 @@ static void action_recv(const char *const *action) {
 static void action_Irecv(const char *const *action)
 {
   CHECK_ACTION_PARAMS(action, 2, 1)
-  int from = atoi(action[2]);
+  int from     = std::stoi(action[2]);
   double size=parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
 
-  if(action[4])
-    MPI_CURRENT_TYPE=decode_datatype(action[4]);
-  else
-    MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                     new simgrid::instr::Pt2PtTIData("Irecv", from, size, encode_datatype(MPI_CURRENT_TYPE)));
+                     new simgrid::instr::Pt2PtTIData("Irecv", from, size, MPI_CURRENT_TYPE->encode()));
   MPI_Status status;
   //unknow size from the receiver pov
   if (size <= 0.0) {
@@ -393,17 +312,18 @@ static void action_waitall(const char *const *action){
   if (count_requests>0) {
     MPI_Status status[count_requests];
 
-   int my_proc_id_traced = Actor::self()->getPid();
-   TRACE_smpi_comm_in(my_proc_id_traced, __FUNCTION__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
-   int recvs_snd[count_requests];
-   int recvs_rcv[count_requests];
-   for (unsigned int i = 0; i < count_requests; i++) {
-     const auto& req = (*get_reqq_self())[i];
-     if (req && (req->flags () & RECV)){
-       recvs_snd[i]=req->src();
-       recvs_rcv[i]=req->dst();
-     }else
-       recvs_snd[i]=-100;
+    int my_proc_id_traced = Actor::self()->getPid();
+    TRACE_smpi_comm_in(my_proc_id_traced, __FUNCTION__,
+                       new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
+    int recvs_snd[count_requests];
+    int recvs_rcv[count_requests];
+    for (unsigned int i = 0; i < count_requests; i++) {
+      const auto& req = (*get_reqq_self())[i];
+      if (req && (req->flags() & RECV)) {
+        recvs_snd[i] = req->src();
+        recvs_rcv[i] = req->dst();
+      } else
+        recvs_snd[i] = -100;
    }
    Request::waitall(count_requests, &(*get_reqq_self())[0], status);
 
@@ -432,20 +352,14 @@ static void action_bcast(const char *const *action)
   CHECK_ACTION_PARAMS(action, 1, 2)
   double size = parse_double(action[2]);
   double clock = smpi_process()->simulated_elapsed();
-  int root=0;
+  int root     = (action[3]) ? std::stoi(action[3]) : 0;
   /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */
-  MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
-
-  if(action[3]) {
-    root= atoi(action[3]);
-    if(action[4])
-      MPI_CURRENT_TYPE=decode_datatype(action[4]);
-  }
+  MPI_Datatype MPI_CURRENT_TYPE = (action[3] && action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                     new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(root)->getPid(), -1.0, size, -1,
-                                                    encode_datatype(MPI_CURRENT_TYPE), ""));
+                     new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(root)->getPid(), -1.0, size,
+                                                    -1, MPI_CURRENT_TYPE->encode(), ""));
 
   void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size());
 
@@ -461,19 +375,14 @@ static void action_reduce(const char *const *action)
   double comm_size = parse_double(action[2]);
   double comp_size = parse_double(action[3]);
   double clock = smpi_process()->simulated_elapsed();
-  int root=0;
-  MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  int root         = (action[4]) ? std::stoi(action[4]) : 0;
 
-  if(action[4]) {
-    root= atoi(action[4]);
-    if(action[5])
-      MPI_CURRENT_TYPE=decode_datatype(action[5]);
-  }
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
 
   int my_proc_id = Actor::self()->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(root)->getPid(), comp_size,
-                                                    comm_size, -1, encode_datatype(MPI_CURRENT_TYPE), ""));
+                                                    comm_size, -1, MPI_CURRENT_TYPE->encode(), ""));
 
   void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
   void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
@@ -489,17 +398,14 @@ static void action_allReduce(const char *const *action) {
   double comm_size = parse_double(action[2]);
   double comp_size = parse_double(action[3]);
 
-  if(action[4])
-    MPI_CURRENT_TYPE=decode_datatype(action[4]);
-  else
-    MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
 
   double clock = smpi_process()->simulated_elapsed();
   int my_proc_id = Actor::self()->getPid();
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allReduce", -1, comp_size, comm_size, -1,
-                                                                        encode_datatype(MPI_CURRENT_TYPE), ""));
+                                                                              MPI_CURRENT_TYPE->encode(), ""));
 
-  void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
+  void *recvbuf = smpi_get_tmp_recvbuffer(comm_size* MPI_CURRENT_TYPE->size());
   void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
   Colls::allreduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
@@ -514,22 +420,16 @@ static void action_allToAll(const char *const *action) {
   int comm_size = MPI_COMM_WORLD->size();
   int send_size = parse_double(action[2]);
   int recv_size = parse_double(action[3]);
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
-
-  if(action[4] && action[5]) {
-    MPI_CURRENT_TYPE=decode_datatype(action[4]);
-    MPI_CURRENT_TYPE2=decode_datatype(action[5]);
-  }
-  else
-    MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE2{(action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE};
 
   void *send = smpi_get_tmp_sendbuffer(send_size*comm_size* MPI_CURRENT_TYPE->size());
   void *recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size());
 
   int my_proc_id = Actor::self()->getPid();
-  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allToAll", -1, -1.0, send_size, recv_size,
-                                                                        encode_datatype(MPI_CURRENT_TYPE),
-                                                                        encode_datatype(MPI_CURRENT_TYPE2)));
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
+                     new simgrid::instr::CollTIData("allToAll", -1, -1.0, send_size, recv_size,
+                                                    MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
   Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
@@ -552,26 +452,20 @@ static void action_gather(const char *const *action) {
   int comm_size = MPI_COMM_WORLD->size();
   int send_size = parse_double(action[2]);
   int recv_size = parse_double(action[3]);
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
-  if(action[4] && action[5]) {
-    MPI_CURRENT_TYPE=decode_datatype(action[5]);
-    MPI_CURRENT_TYPE2=decode_datatype(action[6]);
-  } else {
-    MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE;
-  }
+  MPI_Datatype MPI_CURRENT_TYPE = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE};
+
   void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size());
   void *recv = nullptr;
-  int root=0;
-  if(action[4])
-    root=atoi(action[4]);
+  int root   = (action[4]) ? std::stoi(action[4]) : 0;
   int rank = MPI_COMM_WORLD->rank();
 
   if(rank==root)
     recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size());
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size,
-                                                                        encode_datatype(MPI_CURRENT_TYPE),
-                                                                        encode_datatype(MPI_CURRENT_TYPE2)));
+  TRACE_smpi_comm_in(rank, __FUNCTION__,
+                     new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size,
+                                                    MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
   Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
 
@@ -595,26 +489,20 @@ static void action_scatter(const char* const* action)
   int comm_size                  = MPI_COMM_WORLD->size();
   int send_size                  = parse_double(action[2]);
   int recv_size                  = parse_double(action[3]);
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
-  if (action[4] && action[5]) {
-    MPI_CURRENT_TYPE  = decode_datatype(action[5]);
-    MPI_CURRENT_TYPE2 = decode_datatype(action[6]);
-  } else {
-    MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE;
-  }
+  MPI_Datatype MPI_CURRENT_TYPE  = (action[5] && action[6]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE2{(action[5] && action[6]) ? decode_datatype(action[6]) : MPI_DEFAULT_TYPE};
+
   void* send = smpi_get_tmp_sendbuffer(send_size * MPI_CURRENT_TYPE->size());
   void* recv = nullptr;
-  int root   = 0;
-  if (action[4])
-    root   = atoi(action[4]);
+  int root   = (action[4]) ? std::stoi(action[4]) : 0;
   int rank = MPI_COMM_WORLD->rank();
 
   if (rank == root)
     recv = smpi_get_tmp_recvbuffer(recv_size * comm_size * MPI_CURRENT_TYPE2->size());
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size,
-                                                                        encode_datatype(MPI_CURRENT_TYPE),
-                                                                        encode_datatype(MPI_CURRENT_TYPE2)));
+  TRACE_smpi_comm_in(rank, __FUNCTION__,
+                     new simgrid::instr::CollTIData("gather", root, -1.0, send_size, recv_size,
+                                                    MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
   Colls::scatter(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
 
@@ -636,40 +524,33 @@ static void action_gatherv(const char *const *action) {
   int comm_size = MPI_COMM_WORLD->size();
   CHECK_ACTION_PARAMS(action, comm_size+1, 2)
   int send_size = parse_double(action[2]);
-  int disps[comm_size];
-  int recvcounts[comm_size];
-  int recv_sum=0;
+  std::vector<int> disps(comm_size, 0);
+  std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>(comm_size));
 
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
-  if(action[4+comm_size] && action[5+comm_size]) {
-    MPI_CURRENT_TYPE=decode_datatype(action[4+comm_size]);
-    MPI_CURRENT_TYPE2=decode_datatype(action[5+comm_size]);
-  } else
-    MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE =
+      (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE2{
+      (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE};
 
   void *send = smpi_get_tmp_sendbuffer(send_size* MPI_CURRENT_TYPE->size());
   void *recv = nullptr;
   for(int i=0;i<comm_size;i++) {
-    recvcounts[i] = atoi(action[i+3]);
-    recv_sum=recv_sum+recvcounts[i];
-    disps[i]=0;
+    (*recvcounts)[i] = std::stoi(action[i + 3]);
   }
+  int recv_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
 
-  int root=atoi(action[3+comm_size]);
+  int root = (action[3 + comm_size]) ? std::stoi(action[3 + comm_size]) : 0;
   int rank = MPI_COMM_WORLD->rank();
 
   if(rank==root)
     recv = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size());
 
-  std::vector<int>* trace_recvcounts = new std::vector<int>;
-  for (int i = 0; i < comm_size; i++) // copy data to avoid bad free
-    trace_recvcounts->push_back(recvcounts[i]);
-
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData(
-                                             "gatherV", root, send_size, nullptr, -1, trace_recvcounts,
-                                             encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2)));
+  TRACE_smpi_comm_in(rank, __FUNCTION__,
+                     new simgrid::instr::VarCollTIData("gatherV", root, send_size, nullptr, -1, recvcounts,
+                                                       MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
-  Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts, disps, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
+  Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts->data(), disps.data(), MPI_CURRENT_TYPE2, root,
+                 MPI_COMM_WORLD);
 
   TRACE_smpi_comm_out(Actor::self()->getPid());
   log_timed_action (action, clock);
@@ -690,40 +571,33 @@ static void action_scatterv(const char* const* action)
   int comm_size = MPI_COMM_WORLD->size();
   CHECK_ACTION_PARAMS(action, comm_size + 1, 2)
   int recv_size = parse_double(action[2 + comm_size]);
-  int disps[comm_size];
-  int sendcounts[comm_size];
-  int send_sum = 0;
+  std::vector<int> disps(comm_size, 0);
+  std::shared_ptr<std::vector<int>> sendcounts(new std::vector<int>(comm_size));
 
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
-  if (action[4 + comm_size] && action[5 + comm_size]) {
-    MPI_CURRENT_TYPE  = decode_datatype(action[4 + comm_size]);
-    MPI_CURRENT_TYPE2 = decode_datatype(action[5 + comm_size]);
-  } else
-    MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE =
+      (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[4 + comm_size]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE2{
+      (action[4 + comm_size] && action[5 + comm_size]) ? decode_datatype(action[5 + comm_size]) : MPI_DEFAULT_TYPE};
 
   void* send = nullptr;
   void* recv = smpi_get_tmp_recvbuffer(recv_size * MPI_CURRENT_TYPE->size());
   for (int i = 0; i < comm_size; i++) {
-    sendcounts[i] = atoi(action[i + 2]);
-    send_sum += sendcounts[i];
-    disps[i] = 0;
+    (*sendcounts)[i] = std::stoi(action[i + 2]);
   }
+  int send_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
 
-  int root = atoi(action[3 + comm_size]);
+  int root = (action[3 + comm_size]) ? std::stoi(action[3 + comm_size]) : 0;
   int rank = MPI_COMM_WORLD->rank();
 
   if (rank == root)
     send = smpi_get_tmp_sendbuffer(send_sum * MPI_CURRENT_TYPE2->size());
 
-  std::vector<int>* trace_sendcounts = new std::vector<int>;
-  for (int i = 0; i < comm_size; i++) // copy data to avoid bad free
-    trace_sendcounts->push_back(sendcounts[i]);
+  TRACE_smpi_comm_in(rank, __FUNCTION__,
+                     new simgrid::instr::VarCollTIData("gatherV", root, -1, sendcounts, recv_size, nullptr,
+                                                       MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData(
-                                             "gatherV", root, -1, trace_sendcounts, recv_size, nullptr,
-                                             encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2)));
-
-  Colls::scatterv(send, sendcounts, disps, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
+  Colls::scatterv(send, sendcounts->data(), disps.data(), MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root,
+                  MPI_COMM_WORLD);
 
   TRACE_smpi_comm_out(Actor::self()->getPid());
   log_timed_action(action, clock);
@@ -741,30 +615,24 @@ 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>;
-  if(action[3+comm_size])
-    MPI_CURRENT_TYPE=decode_datatype(action[3+comm_size]);
-  else
-    MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+  int my_proc_id                     = Actor::self()->getPid();
+  std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>);
+  MPI_Datatype 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];
+    recvcounts->push_back(std::stoi(action[i + 2]));
   }
+  int size{std::accumulate(recvcounts->begin(), recvcounts->end(), 0)};
 
   TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                     new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts,
+                     new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, recvcounts,
                                                        std::to_string(comp_size), /* ugly hack to print comp_size */
-                                                       encode_datatype(MPI_CURRENT_TYPE)));
+                                                       MPI_CURRENT_TYPE->encode()));
 
   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, recvcounts->data(), MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
   TRACE_smpi_comm_out(my_proc_id);
@@ -782,25 +650,20 @@ static void action_allgather(const char *const *action) {
   double clock = smpi_process()->simulated_elapsed();
 
   CHECK_ACTION_PARAMS(action, 2, 2)
-  int sendcount=atoi(action[2]);
-  int recvcount=atoi(action[3]);
+  int sendcount = std::stoi(action[2]);
+  int recvcount = std::stoi(action[3]);
 
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
-
-  if(action[4] && action[5]) {
-    MPI_CURRENT_TYPE = decode_datatype(action[4]);
-    MPI_CURRENT_TYPE2 = decode_datatype(action[5]);
-  } else
-    MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4] && action[5]) ? decode_datatype(action[4]) : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE2{(action[4] && action[5]) ? decode_datatype(action[5]) : MPI_DEFAULT_TYPE};
 
   void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size());
   void *recvbuf = smpi_get_tmp_recvbuffer(recvcount* MPI_CURRENT_TYPE2->size());
 
   int my_proc_id = Actor::self()->getPid();
 
-  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount,
-                                                                        encode_datatype(MPI_CURRENT_TYPE),
-                                                                        encode_datatype(MPI_CURRENT_TYPE2)));
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
+                     new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount,
+                                                    MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
   Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
@@ -820,39 +683,44 @@ static void action_allgatherv(const char *const *action) {
 
   int comm_size = MPI_COMM_WORLD->size();
   CHECK_ACTION_PARAMS(action, comm_size+1, 2)
-  int sendcount=atoi(action[2]);
-  int recvcounts[comm_size];
-  int disps[comm_size];
-  int recv_sum=0;
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
-
-  if(action[3+comm_size] && action[4+comm_size]) {
-    MPI_CURRENT_TYPE = decode_datatype(action[3+comm_size]);
-    MPI_CURRENT_TYPE2 = decode_datatype(action[4+comm_size]);
-  } else
-    MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE;
+  int sendcount = std::stoi(action[2]);
+  std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>(comm_size));
+  std::vector<int> disps(comm_size, 0);
+
+  int datatype_index = 0, disp_index = 0;
+  if (action[3 + 2 * comm_size]) { /* datatype + disp are specified */
+    datatype_index = 3 + comm_size;
+    disp_index     = datatype_index + 1;
+  } else if (action[3 + 2 * comm_size]) { /* disps specified; datatype is not specified; use the default one */
+    datatype_index = -1;
+    disp_index     = 3 + comm_size;
+  } else if (action[3 + comm_size]) { /* only datatype, no disp specified */
+    datatype_index = 3 + comm_size;
+  }
+
+  if (disp_index != 0) {
+    std::copy(action[disp_index], action[disp_index + comm_size], disps.begin());
+  }
+
+  MPI_Datatype MPI_CURRENT_TYPE{(datatype_index > 0) ? decode_datatype(action[datatype_index]) : MPI_DEFAULT_TYPE};
+  MPI_Datatype MPI_CURRENT_TYPE2{(datatype_index > 0) ? decode_datatype(action[datatype_index]) : MPI_DEFAULT_TYPE};
 
   void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size());
 
   for(int i=0;i<comm_size;i++) {
-    recvcounts[i] = atoi(action[i+3]);
-    recv_sum=recv_sum+recvcounts[i];
-    disps[i] = 0;
+    (*recvcounts)[i] = std::stoi(action[i + 3]);
   }
+  int recv_sum  = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
   void *recvbuf = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size());
 
   int my_proc_id = Actor::self()->getPid();
 
-  std::vector<int>* trace_recvcounts = new std::vector<int>;
-  for (int i = 0; i < comm_size; i++) // copy data to avoid bad free
-    trace_recvcounts->push_back(recvcounts[i]);
-
-  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData(
-                                             "allGatherV", -1, sendcount, nullptr, -1, trace_recvcounts,
-                                             encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2)));
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
+                     new simgrid::instr::VarCollTIData("allGatherV", -1, sendcount, nullptr, -1, recvcounts,
+                                                       MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
-  Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2,
-                          MPI_COMM_WORLD);
+  Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts->data(), disps.data(), MPI_CURRENT_TYPE2,
+                    MPI_COMM_WORLD);
 
   TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
@@ -871,47 +739,37 @@ static void action_allToAllv(const char *const *action) {
 
   int comm_size = MPI_COMM_WORLD->size();
   CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2)
-  int send_size = 0;
-  int recv_size = 0;
-  int sendcounts[comm_size];
-  std::vector<int>* trace_sendcounts = new std::vector<int>;
-  int recvcounts[comm_size];
-  std::vector<int>* trace_recvcounts = new std::vector<int>;
-  int senddisps[comm_size];
-  int recvdisps[comm_size];
-
-  MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
+  std::shared_ptr<std::vector<int>> sendcounts(new std::vector<int>(comm_size));
+  std::shared_ptr<std::vector<int>> recvcounts(new std::vector<int>(comm_size));
+  std::vector<int> senddisps(comm_size, 0);
+  std::vector<int> recvdisps(comm_size, 0);
+
+  MPI_Datatype MPI_CURRENT_TYPE = (action[4 + 2 * comm_size] && action[5 + 2 * comm_size])
+                                      ? decode_datatype(action[4 + 2 * comm_size])
+                                      : MPI_DEFAULT_TYPE;
+  MPI_Datatype MPI_CURRENT_TYPE2{(action[4 + 2 * comm_size] && action[5 + 2 * comm_size])
+                                     ? decode_datatype(action[5 + 2 * comm_size])
+                                     : MPI_DEFAULT_TYPE};
 
   int send_buf_size=parse_double(action[2]);
   int recv_buf_size=parse_double(action[3+comm_size]);
-  if(action[4+2*comm_size] && action[5+2*comm_size]) {
-    MPI_CURRENT_TYPE=decode_datatype(action[4+2*comm_size]);
-    MPI_CURRENT_TYPE2=decode_datatype(action[5+2*comm_size]);
-  }
-  else
-    MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE;
-
-  int my_proc_id       = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
   void *sendbuf = smpi_get_tmp_sendbuffer(send_buf_size* MPI_CURRENT_TYPE->size());
   void *recvbuf  = smpi_get_tmp_recvbuffer(recv_buf_size* MPI_CURRENT_TYPE2->size());
 
   for(int i=0;i<comm_size;i++) {
-    sendcounts[i] = atoi(action[i+3]);
-    trace_sendcounts->push_back(sendcounts[i]);
-    send_size += sendcounts[i];
-    recvcounts[i] = atoi(action[i+4+comm_size]);
-    trace_recvcounts->push_back(recvcounts[i]);
-    recv_size += recvcounts[i];
-    senddisps[i] = 0;
-    recvdisps[i] = 0;
+    (*sendcounts)[i] = std::stoi(action[3 + i]);
+    (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]);
   }
+  int send_size = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
+  int recv_size = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
 
-  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData(
-                                             "allToAllV", -1, send_size, trace_sendcounts, recv_size, trace_recvcounts,
-                                             encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2)));
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
+                     new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, sendcounts, recv_size, recvcounts,
+                                                       MPI_CURRENT_TYPE->encode(), MPI_CURRENT_TYPE2->encode()));
 
-  Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps,
-                         MPI_CURRENT_TYPE, MPI_COMM_WORLD);
+  Colls::alltoallv(sendbuf, sendcounts->data(), senddisps.data(), MPI_CURRENT_TYPE, recvbuf, recvcounts->data(),
+                   recvdisps.data(), MPI_CURRENT_TYPE, MPI_COMM_WORLD);
 
   TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
@@ -996,8 +854,7 @@ void smpi_replay_main(int* argc, char*** argv)
   if(active_processes==0){
     /* Last process alive speaking: end the simulated timer */
     XBT_INFO("Simulation time %f", smpi_process()->simulated_elapsed());
-    xbt_free(sendbuffer);
-    xbt_free(recvbuffer);
+    smpi_free_replay_tmp_buffers();
   }
 
   TRACE_smpi_comm_in(Actor::self()->getPid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize"));