[SMPI] Fix branch conditions

[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 565cd19..e65846b 100644 (file)
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -31,11 +31,10 @@ static MPI_Datatype MPI_DEFAULT_TYPE;
   {                                                                                                                    \
     if (action.size() < static_cast<unsigned long>(mandatory + 2))                                                     \
       THROWF(arg_error, 0, "%s replay failed.\n"                                                                       \
-                           "%lu items were given on the line. First two should be process_id and action.  "            \
+                           "%zu items were given on the line. First two should be process_id and action.  "            \
                            "This action needs after them %lu mandatory arguments, and accepts %lu optional ones. \n"   \
                            "Please contact the Simgrid team if support is needed",                                     \
-             __FUNCTION__, action.size(), static_cast<unsigned long>(mandatory),                                       \
-             static_cast<unsigned long>(optional));                                                                    \
+             __func__, action.size(), static_cast<unsigned long>(mandatory), static_cast<unsigned long>(optional));    \
   }
 
 static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock)
@@ -201,7 +200,7 @@ public:
 
 class GatherVArgParser : public CollCommParser {
 public:
-  int recv_sum;
+  int recv_size_sum;
   std::shared_ptr<std::vector<int>> recvcounts;
   std::vector<int> disps;
   void parse(simgrid::xbt::ReplayAction& action, std::string name) override
@@ -230,13 +229,16 @@ public:
     }
     else {
       int datatype_index = 0, disp_index = 0;
-      if (action.size() > 3 + 2 * comm_size) { /* datatype + disp are specified */
+      /* The 3 comes from "0 gather <sendcount>", which must always be present.
+       * The + comm_size is the recvcounts array, which must also be present
+       */
+      if (action.size() > 3 + comm_size + comm_size) { /* datatype + disp are specified */
         datatype_index = 3 + comm_size;
         disp_index     = datatype_index + 1;
-      } else if (action.size() > 3 + 2 * comm_size) { /* disps specified; datatype is not specified; use the default one */
+      } else if (action.size() > 3 + comm_size + 2) { /* disps specified; datatype is not specified; use the default one */
         datatype_index = -1;
         disp_index     = 3 + comm_size;
-      } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */
+      } else if (action.size() > 3 + comm_size)  { /* only datatype, no disp specified */
         datatype_index = 3 + comm_size;
       }
 
@@ -252,7 +254,7 @@ public:
     for (unsigned int i = 0; i < comm_size; i++) {
       (*recvcounts)[i] = std::stoi(action[i + 3]);
     }
-    recv_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
+    recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
   }
 };
 
@@ -283,8 +285,8 @@ public:
 
 class ScatterVArgParser : public CollCommParser {
 public:
-  int recv_sum;
-  int send_sum;
+  int recv_size_sum;
+  int send_size_sum;
   std::shared_ptr<std::vector<int>> sendcounts;
   std::vector<int> disps;
   void parse(simgrid::xbt::ReplayAction& action, std::string name) override
@@ -311,14 +313,14 @@ public:
     for (unsigned int i = 0; i < comm_size; i++) {
       (*sendcounts)[i] = std::stoi(action[i + 2]);
     }
-    send_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
+    send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
     root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0;
   }
 };
 
 class ReduceScatterArgParser : public CollCommParser {
 public:
-  int recv_sum;
+  int recv_size_sum;
   std::shared_ptr<std::vector<int>> recvcounts;
   std::vector<int> disps;
   void parse(simgrid::xbt::ReplayAction& action, std::string name) override
@@ -340,14 +342,14 @@ public:
     for (unsigned int i = 0; i < comm_size; i++) {
       recvcounts->push_back(std::stoi(action[i + 2]));
     }
-    recv_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
+    recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
   }
 };
 
 class AllToAllVArgParser : public CollCommParser {
 public:
-  int recv_sum;
-  int send_sum;
+  int recv_size_sum;
+  int send_size_sum;
   std::shared_ptr<std::vector<int>> recvcounts;
   std::shared_ptr<std::vector<int>> sendcounts;
   std::vector<int> senddisps;
@@ -382,8 +384,8 @@ public:
       (*sendcounts)[i] = std::stoi(action[3 + i]);
       (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]);
     }
-    send_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
-    recv_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
+    send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0);
+    recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0);
   }
 };
 
@@ -444,7 +446,7 @@ public:
     int dst                  = request->comm()->group()->rank(request->dst());
     bool is_wait_for_receive = (request->flags() & RECV);
     // TODO: Here we take the rank while we normally take the process id (look for my_proc_id)
-    TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("wait"));
+    TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("wait"));
 
     MPI_Status status;
     Request::wait(&request, &status);
@@ -463,8 +465,8 @@ public:
   {
     int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->getPid();
 
-    TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
-                                                                                 Datatype::encode(args.datatype1)));
+    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
+                                                                             Datatype::encode(args.datatype1)));
     if (not TRACE_smpi_view_internals())
       TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, args.size * args.datatype1->size());
 
@@ -489,8 +491,8 @@ public:
   {
     int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->getPid();
 
-    TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
-                                                                                 Datatype::encode(args.datatype1)));
+    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size,
+                                                                             Datatype::encode(args.datatype1)));
 
     MPI_Status status;
     // unknown size from the receiver point of view
@@ -583,8 +585,7 @@ public:
     const unsigned int count_requests = get_reqq_self()->size();
 
     if (count_requests > 0) {
-      TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-                         new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
+      TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
       std::vector<std::pair</*sender*/int,/*recv*/int>> sender_receiver;
       for (const auto& req : (*get_reqq_self())) {
         if (req && (req->flags() & RECV)) {
@@ -607,7 +608,7 @@ public:
   BarrierAction() : ReplayAction("barrier") {}
   void kernel(simgrid::xbt::ReplayAction& action) override
   {
-    TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier"));
+    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("barrier"));
     Colls::barrier(MPI_COMM_WORLD);
     TRACE_smpi_comm_out(my_proc_id);
   }
@@ -713,12 +714,12 @@ public:
 
     if (name == "gatherV") {
       Colls::gatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, 
-                     (rank == args.root) ? recv_buffer(args.recv_sum  * args.datatype2->size()) : nullptr, args.recvcounts->data(), args.disps.data(), args.datatype2, args.root,
+                     (rank == args.root) ? recv_buffer(args.recv_size_sum  * args.datatype2->size()) : nullptr, args.recvcounts->data(), args.disps.data(), args.datatype2, args.root,
                      MPI_COMM_WORLD);
     }
     else {
       Colls::allgatherv(send_buffer(args.send_size * args.datatype1->size()), args.send_size, args.datatype1, 
-                        recv_buffer(args.recv_sum * args.datatype2->size()), args.recvcounts->data(), args.disps.data(), args.datatype2,
+                        recv_buffer(args.recv_size_sum * args.datatype2->size()), args.recvcounts->data(), args.disps.data(), args.datatype2,
                     MPI_COMM_WORLD);
     }
 
@@ -754,7 +755,7 @@ public:
           nullptr, Datatype::encode(args.datatype1),
           Datatype::encode(args.datatype2)));
 
-    Colls::scatterv((rank == args.root) ? send_buffer(args.send_sum * args.datatype1->size()) : nullptr, args.sendcounts->data(), args.disps.data(), 
+    Colls::scatterv((rank == args.root) ? send_buffer(args.send_size_sum * args.datatype1->size()) : nullptr, args.sendcounts->data(), args.disps.data(), 
         args.datatype1, recv_buffer(args.recv_size * args.datatype2->size()), args.recv_size, args.datatype2, args.root,
         MPI_COMM_WORLD);
 
@@ -772,7 +773,7 @@ public:
                                                          std::to_string(args.comp_size), /* ugly hack to print comp_size */
                                                          Datatype::encode(args.datatype1)));
 
-    Colls::reduce_scatter(send_buffer(args.recv_sum * args.datatype1->size()), recv_buffer(args.recv_sum * args.datatype1->size()), 
+    Colls::reduce_scatter(send_buffer(args.recv_size_sum * args.datatype1->size()), recv_buffer(args.recv_size_sum * args.datatype1->size()), 
                           args.recvcounts->data(), args.datatype1, MPI_OP_NULL, MPI_COMM_WORLD);
 
     smpi_execute_flops(args.comp_size);
@@ -785,10 +786,10 @@ public:
   AllToAllVAction() : ReplayAction("allToAllV") {}
   void kernel(simgrid::xbt::ReplayAction& action) override
   {
-    TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
-        new simgrid::instr::VarCollTIData("allToAllV", -1, args.send_sum, args.sendcounts, args.recv_sum, args.recvcounts,
-          Datatype::encode(args.datatype1),
-          Datatype::encode(args.datatype2)));
+    TRACE_smpi_comm_in(my_proc_id, __func__,
+                       new simgrid::instr::VarCollTIData(
+                           "allToAllV", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts,
+                           Datatype::encode(args.datatype1), Datatype::encode(args.datatype2)));
 
     Colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), args.senddisps.data(), args.datatype1,
                      recv_buffer(args.recv_buf_size * args.datatype2->size()), args.recvcounts->data(), args.recvdisps.data(), args.datatype2, MPI_COMM_WORLD);