From: Lucas Mello Schnorr <schnorr@inf.ufrgs.br>
Date: Tue, 19 Jan 2016 10:56:20 +0000 (-0200)
Subject: [action replay] verify optional parameters at the same time in alltoall
X-Git-Tag: v3_13~1207^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4d69a71756fe9a6e349ff0e65f2e892f6a621cbe?hp=9ce4f8903c6a9891f5be7913556a4b4e08f27a23

[action replay] verify optional parameters at the same time in alltoall
---

diff --git a/src/smpi/smpi_replay.c b/src/smpi/smpi_replay.c
index bee8307852..d92975d608 100644
--- a/src/smpi/smpi_replay.c
+++ b/src/smpi/smpi_replay.c
@@ -644,19 +644,15 @@ static void action_allToAll(const char *const *action) {
   int recv_size = parse_double(action[3]);
   MPI_Datatype MPI_CURRENT_TYPE2;
 
-  if(action[4]) {
+  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;
-  }
-
-  if (action[5]){
-    MPI_CURRENT_TYPE2=decode_datatype(action[5]);
-  }
-  else {
     MPI_CURRENT_TYPE2=MPI_DEFAULT_TYPE;
   }
+
   void *send = smpi_get_tmp_sendbuffer(send_size*comm_size* smpi_datatype_size(MPI_CURRENT_TYPE));
   void *recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* smpi_datatype_size(MPI_CURRENT_TYPE2));