X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e5e2f94ceb52c1f80ec3fdd9a39356d026580fe..aa3595ed3c903167f52eeeab8e636bec96b258dd:/src/smpi/smpi_replay.cpp

diff --git a/src/smpi/smpi_replay.cpp b/src/smpi/smpi_replay.cpp
index 3941fb6a7e..7b7a5dc300 100644
--- a/src/smpi/smpi_replay.cpp
+++ b/src/smpi/smpi_replay.cpp
@@ -239,7 +239,7 @@ static void action_send(const char *const *action)
   extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
   TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
   if (!TRACE_smpi_view_internals()) {
-    TRACE_smpi_send(rank, rank, dst_traced, size*smpi_datatype_size(MPI_CURRENT_TYPE));
+    TRACE_smpi_send(rank, rank, dst_traced, 0, size*smpi_datatype_size(MPI_CURRENT_TYPE));
   }
 
   smpi_mpi_send(nullptr, size, MPI_CURRENT_TYPE, to , 0, MPI_COMM_WORLD);
@@ -272,7 +272,7 @@ static void action_Isend(const char *const *action)
   extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
   TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
   if (!TRACE_smpi_view_internals()) {
-    TRACE_smpi_send(rank, rank, dst_traced, size*smpi_datatype_size(MPI_CURRENT_TYPE));
+    TRACE_smpi_send(rank, rank, dst_traced, 0, size*smpi_datatype_size(MPI_CURRENT_TYPE));
   }
 
   request = smpi_mpi_isend(nullptr, size, MPI_CURRENT_TYPE, to, 0,MPI_COMM_WORLD);
@@ -308,17 +308,17 @@ static void action_recv(const char *const *action) {
   extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
   TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
 
-  //unknow size from the receiver pov
+  //unknown size from the receiver point of view
   if(size<=0.0){
-      smpi_mpi_probe(from, 0, MPI_COMM_WORLD, &status);
-      size=status.count;
+    smpi_mpi_probe(from, 0, MPI_COMM_WORLD, &status);
+    size=status.count;
   }
 
   smpi_mpi_recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
 
   TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
   if (!TRACE_smpi_view_internals()) {
-    TRACE_smpi_recv(rank, src_traced, rank);
+    TRACE_smpi_recv(rank, src_traced, rank, 0);
   }
 
   log_timed_action (action, clock);
@@ -419,7 +419,7 @@ static void action_wait(const char *const *action){
 
   TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__);
   if (is_wait_for_receive)
-    TRACE_smpi_recv(rank, src_traced, dst_traced);
+    TRACE_smpi_recv(rank, src_traced, dst_traced, 0);
   log_timed_action (action, clock);
 }
 
@@ -436,15 +436,26 @@ static void action_waitall(const char *const *action){
    extra->type = TRACING_WAITALL;
    extra->send_size=count_requests;
    TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__,extra);
-
+   int* recvs_snd= xbt_new0(int,count_requests);
+   int* recvs_rcv= xbt_new0(int,count_requests);
+   unsigned int i=0;
+   for (auto req : *(get_reqq_self())){
+     if (req && req->recv){
+       recvs_snd[i]=req->src;
+       recvs_rcv[i]=req->dst;
+     }else
+       recvs_snd[i]=-100;
+     i++;
+   }
    smpi_mpi_waitall(count_requests, &(*get_reqq_self())[0], status);
 
-   for (auto req : *(get_reqq_self())){
-     if (req && req->recv)
-       TRACE_smpi_recv(rank_traced, req->src, req->dst);
+   for (i=0; i<count_requests;i++){
+     if (recvs_snd[i]!=-100)
+       TRACE_smpi_recv(rank_traced, recvs_snd[i], recvs_rcv[i],0);
    }
+   xbt_free(recvs_rcv);
+   xbt_free(recvs_snd);
    TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__);
-   set_reqq_self(new std::vector<MPI_Request>);
   }
   log_timed_action (action, clock);
 }
@@ -876,7 +887,6 @@ static void action_allToAllv(const char *const *action) {
 
   int comm_size = smpi_comm_size(MPI_COMM_WORLD);
   CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2)
-  int send_buf_size=0,recv_buf_size=0,i=0;
   int *sendcounts = xbt_new0(int, comm_size);  
   int *recvcounts = xbt_new0(int, comm_size);  
   int *senddisps = xbt_new0(int, comm_size);  
@@ -884,8 +894,8 @@ static void action_allToAllv(const char *const *action) {
 
   MPI_Datatype MPI_CURRENT_TYPE2;
 
-  send_buf_size=parse_double(action[2]);
-  recv_buf_size=parse_double(action[3+comm_size]);
+  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]);
@@ -898,7 +908,7 @@ static void action_allToAllv(const char *const *action) {
   void *sendbuf = smpi_get_tmp_sendbuffer(send_buf_size* smpi_datatype_size(MPI_CURRENT_TYPE));
   void *recvbuf  = smpi_get_tmp_recvbuffer(recv_buf_size* smpi_datatype_size(MPI_CURRENT_TYPE2));
 
-  for(i=0;i<comm_size;i++) {
+  for(int i=0;i<comm_size;i++) {
     sendcounts[i] = atoi(action[i+3]);
     recvcounts[i] = atoi(action[i+4+comm_size]);
   }
@@ -910,7 +920,7 @@ static void action_allToAllv(const char *const *action) {
   extra->sendcounts= xbt_new(int, comm_size);
   extra->num_processes = comm_size;
 
-  for(i=0; i< comm_size; i++){//copy data to avoid bad free
+  for(int i=0; i< comm_size; i++){//copy data to avoid bad free
     extra->send_size += sendcounts[i];
     extra->sendcounts[i] = sendcounts[i];
     extra->recv_size += recvcounts[i];