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

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index 98ef1da684..d4102d2c9f 100644
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -118,12 +118,8 @@ static MPI_Datatype decode_datatype(const char *const action)
    return MPI_CURRENT_TYPE;
 }
 
-const char* encode_datatype(MPI_Datatype datatype, int* known)
+const char* encode_datatype(MPI_Datatype datatype)
 {
-  //default type for output is set to MPI_BYTE
-  // MPI_DEFAULT_TYPE is not set for output, use directly MPI_BYTE
-  if(known!=nullptr)
-    *known=1;
   if (datatype==MPI_BYTE)
       return "";
   if(datatype==MPI_DOUBLE)
@@ -138,9 +134,6 @@ const char* encode_datatype(MPI_Datatype datatype, int* known)
     return "4";
   if(datatype==MPI_FLOAT)
       return "5";
-  //tell that the datatype is not handled by replay, and that its size should be measured and replayed as size*MPI_BYTE
-  if(known!=nullptr)
-    *known=0;
   // default - not implemented.
   // do not warn here as we pass in this function even for other trace formats
   return "-1";
@@ -165,8 +158,9 @@ static void action_init(const char *const *action)
   XBT_DEBUG("Initialize the counters");
   CHECK_ACTION_PARAMS(action, 0, 1)
   if(action[2])
-    MPI_DEFAULT_TYPE=MPI_DOUBLE; // default MPE dataype
-  else MPI_DEFAULT_TYPE= MPI_BYTE; // default TAU datatype
+    MPI_DEFAULT_TYPE = MPI_DOUBLE; // default MPE datatype
+  else
+    MPI_DEFAULT_TYPE = MPI_BYTE; // default TAU datatype
 
   /* start a simulated timer */
   smpi_process()->simulated_start();
@@ -234,7 +228,7 @@ static void action_send(const char *const *action)
   extra->send_size = size;
   extra->src = rank;
   extra->dst = dst_traced;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
   if (not TRACE_smpi_view_internals())
     TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
@@ -243,7 +237,7 @@ static void action_send(const char *const *action)
 
   log_timed_action (action, clock);
 
-  TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
 }
 
 static void action_Isend(const char *const *action)
@@ -265,14 +259,14 @@ static void action_Isend(const char *const *action)
   extra->send_size = size;
   extra->src = rank;
   extra->dst = dst_traced;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
   if (not TRACE_smpi_view_internals())
     TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
 
-  MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0,MPI_COMM_WORLD);
+  MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0, MPI_COMM_WORLD);
 
-  TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
 
   get_reqq_self()->push_back(request);
 
@@ -299,7 +293,7 @@ static void action_recv(const char *const *action) {
   extra->send_size = size;
   extra->src = src_traced;
   extra->dst = rank;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
 
   //unknown size from the receiver point of view
@@ -310,7 +304,7 @@ static void action_recv(const char *const *action) {
 
   Request::recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
 
-  TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
   if (not TRACE_smpi_view_internals()) {
     TRACE_smpi_recv(src_traced, rank, 0);
   }
@@ -337,7 +331,7 @@ static void action_Irecv(const char *const *action)
   extra->send_size = size;
   extra->src = src_traced;
   extra->dst = rank;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
   MPI_Status status;
   //unknow size from the receiver pov
@@ -348,7 +342,7 @@ static void action_Irecv(const char *const *action)
 
   MPI_Request request = Request::irecv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD);
 
-  TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
   get_reqq_self()->push_back(request);
 
   log_timed_action (action, clock);
@@ -408,7 +402,7 @@ static void action_wait(const char *const *action){
 
   Request::wait(&request, &status);
 
-  TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
   if (is_wait_for_receive)
     TRACE_smpi_recv(src_traced, dst_traced, 0);
   log_timed_action (action, clock);
@@ -417,7 +411,7 @@ static void action_wait(const char *const *action){
 static void action_waitall(const char *const *action){
   CHECK_ACTION_PARAMS(action, 0, 0)
   double clock = smpi_process()->simulated_elapsed();
-  unsigned int count_requests=get_reqq_self()->size();
+  const unsigned int count_requests = get_reqq_self()->size();
 
   if (count_requests>0) {
     MPI_Status status[count_requests];
@@ -429,22 +423,21 @@ static void action_waitall(const char *const *action){
    TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra);
    int recvs_snd[count_requests];
    int recvs_rcv[count_requests];
-   unsigned int i=0;
-   for (auto const& req : *(get_reqq_self())) {
+   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;
-     i++;
    }
    Request::waitall(count_requests, &(*get_reqq_self())[0], status);
 
-   for (i=0; i<count_requests;i++){
+   for (unsigned i = 0; i < count_requests; i++) {
      if (recvs_snd[i]!=-100)
        TRACE_smpi_recv(recvs_snd[i], recvs_rcv[i],0);
    }
-   TRACE_smpi_ptp_out(rank_traced, -1, __FUNCTION__);
+   TRACE_smpi_ptp_out(rank_traced);
   }
   log_timed_action (action, clock);
 }
@@ -458,7 +451,7 @@ static void action_barrier(const char *const *action){
 
   Colls::barrier(MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -484,13 +477,13 @@ static void action_bcast(const char *const *action)
   extra->type = TRACING_BCAST;
   extra->send_size = size;
   extra->root = root_traced;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   TRACE_smpi_collective_in(rank, __FUNCTION__, extra);
   void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size());
 
   Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -515,7 +508,7 @@ static void action_reduce(const char *const *action)
   extra->type = TRACING_REDUCE;
   extra->send_size = comm_size;
   extra->comp_size = comp_size;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   extra->root = root_traced;
 
   TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
@@ -525,7 +518,7 @@ static void action_reduce(const char *const *action)
   Colls::reduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -545,7 +538,7 @@ static void action_allReduce(const char *const *action) {
   extra->type = TRACING_ALLREDUCE;
   extra->send_size = comm_size;
   extra->comp_size = comp_size;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
 
   void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
@@ -553,7 +546,7 @@ static void action_allReduce(const char *const *action) {
   Colls::allreduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -580,14 +573,14 @@ static void action_allToAll(const char *const *action) {
   extra->type = TRACING_ALLTOALL;
   extra->send_size = send_size;
   extra->recv_size = recv_size;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
-  extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
+  extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
 
   TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
 
   Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -628,14 +621,14 @@ static void action_gather(const char *const *action) {
   extra->send_size = send_size;
   extra->recv_size = recv_size;
   extra->root = root;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
-  extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
+  extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
 
   TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra);
 
   Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(smpi_process()->index(), __FUNCTION__);
+  TRACE_smpi_collective_out(smpi_process()->index());
   log_timed_action (action, clock);
 }
 
@@ -679,21 +672,21 @@ static void action_gatherv(const char *const *action) {
     recv = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size());
 
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
-  extra->type = TRACING_GATHERV;
-  extra->send_size = send_size;
-  extra->recvcounts= xbt_new(int,comm_size);
+  extra->type            = TRACING_GATHERV;
+  extra->send_size       = send_size;
+  extra->recvcounts      = new int[comm_size];
   for(int i=0; i< comm_size; i++)//copy data to avoid bad free
     extra->recvcounts[i] = recvcounts[i];
   extra->root = root;
   extra->num_processes = comm_size;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
-  extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
+  extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
 
   TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra);
 
   Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts, disps, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(smpi_process()->index(), __FUNCTION__);
+  TRACE_smpi_collective_out(smpi_process()->index());
   log_timed_action (action, clock);
 }
 
@@ -725,10 +718,10 @@ static void action_reducescatter(const char *const *action) {
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
   extra->type = TRACING_REDUCE_SCATTER;
   extra->send_size = 0;
-  extra->recvcounts= xbt_new(int, comm_size);
+  extra->recvcounts      = new int[comm_size];
   for(int i=0; i< comm_size; i++)//copy data to avoid bad free
     extra->recvcounts[i] = recvcounts[i];
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   extra->comp_size = comp_size;
   extra->num_processes = comm_size;
 
@@ -740,7 +733,7 @@ static void action_reducescatter(const char *const *action) {
   Colls::reduce_scatter(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -774,15 +767,15 @@ static void action_allgather(const char *const *action) {
   extra->type = TRACING_ALLGATHER;
   extra->send_size = sendcount;
   extra->recv_size= recvcount;
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
-  extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
+  extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
   extra->num_processes = MPI_COMM_WORLD->size();
 
   TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
 
   Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -823,11 +816,11 @@ static void action_allgatherv(const char *const *action) {
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
   extra->type = TRACING_ALLGATHERV;
   extra->send_size = sendcount;
-  extra->recvcounts= xbt_new(int, comm_size);
+  extra->recvcounts      = new int[comm_size];
   for(int i=0; i< comm_size; i++)//copy data to avoid bad free
     extra->recvcounts[i] = recvcounts[i];
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
-  extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
+  extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
+  extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
   extra->num_processes = comm_size;
 
   TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
@@ -835,7 +828,7 @@ static void action_allgatherv(const char *const *action) {
   Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2,
                           MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -881,8 +874,8 @@ static void action_allToAllv(const char *const *action) {
   int rank = smpi_process()->index();
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
   extra->type = TRACING_ALLTOALLV;
-  extra->recvcounts= xbt_new(int, comm_size);
-  extra->sendcounts= xbt_new(int, comm_size);
+  extra->recvcounts      = new int[comm_size];
+  extra->sendcounts      = new int[comm_size];
   extra->num_processes = comm_size;
 
   for(int i=0; i< comm_size; i++){//copy data to avoid bad free
@@ -891,15 +884,15 @@ static void action_allToAllv(const char *const *action) {
     extra->recv_size += recvcounts[i];
     extra->recvcounts[i] = recvcounts[i];
   }
-  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
-  extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
+  extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE);
+  extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2);
 
   TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
 
   Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps,
                          MPI_CURRENT_TYPE, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -918,7 +911,7 @@ void smpi_replay_init(int* argc, char*** argv)
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
   extra->type = TRACING_INIT;
   TRACE_smpi_collective_in(rank, "smpi_replay_run_init", extra);
-  TRACE_smpi_collective_out(rank, "smpi_replay_run_init");
+  TRACE_smpi_collective_out(rank);
   xbt_replay_action_register("init",       simgrid::smpi::action_init);
   xbt_replay_action_register("finalize",   simgrid::smpi::action_finalize);
   xbt_replay_action_register("comm_size",  simgrid::smpi::action_comm_size);
@@ -992,7 +985,7 @@ void smpi_replay_main(int* argc, char*** argv)
 
   smpi_process()->finalize();
 
-  TRACE_smpi_collective_out(smpi_process()->index(), "smpi_replay_run_finalize");
+  TRACE_smpi_collective_out(smpi_process()->index());
   TRACE_smpi_finalize(smpi_process()->index());
 }