X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c3926e2c40bcec2394899543f06d2e1762b64e0..f9df6a0ce7023e4e22d83bb6c50f27bd21fab329:/src/smpi/smpi_coll.cpp?ds=sidebyside

diff --git a/src/smpi/smpi_coll.cpp b/src/smpi/smpi_coll.cpp
index 6d71088681..df33a61663 100644
--- a/src/smpi/smpi_coll.cpp
+++ b/src/smpi/smpi_coll.cpp
@@ -18,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll
 
 s_mpi_coll_description_t mpi_coll_gather_description[] = {
   {"default", "gather default collective", reinterpret_cast<void*>(&smpi_mpi_gather)},
-   COLL_GATHERS(COLL_DESCRIPTION, COLL_COMMA), {NULL, NULL, NULL}      /* this array must be NULL terminated */
+   COLL_GATHERS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 
@@ -27,7 +27,7 @@ s_mpi_coll_description_t mpi_coll_allgather_description[] = {
    "allgather default collective",
    reinterpret_cast<void*>(&smpi_mpi_allgather)},
 COLL_ALLGATHERS(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_allgatherv_description[] = {
@@ -35,7 +35,7 @@ s_mpi_coll_description_t mpi_coll_allgatherv_description[] = {
    "allgatherv default collective",
    reinterpret_cast<void*>(&smpi_mpi_allgatherv)},
 COLL_ALLGATHERVS(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_allreduce_description[] = {
@@ -43,7 +43,7 @@ s_mpi_coll_description_t mpi_coll_allreduce_description[] = {
    "allreduce default collective",
    reinterpret_cast<void*>(&smpi_mpi_allreduce)},
 COLL_ALLREDUCES(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_reduce_scatter_description[] = {
@@ -51,7 +51,7 @@ s_mpi_coll_description_t mpi_coll_reduce_scatter_description[] = {
    "reduce_scatter default collective",
    reinterpret_cast<void*>(&smpi_mpi_reduce_scatter)},
 COLL_REDUCE_SCATTERS(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_scatter_description[] = {
@@ -59,7 +59,7 @@ s_mpi_coll_description_t mpi_coll_scatter_description[] = {
    "scatter default collective",
    reinterpret_cast<void*>(&smpi_mpi_scatter)},
 COLL_SCATTERS(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_barrier_description[] = {
@@ -67,7 +67,7 @@ s_mpi_coll_description_t mpi_coll_barrier_description[] = {
    "barrier default collective",
    reinterpret_cast<void*>(&smpi_mpi_barrier)},
 COLL_BARRIERS(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 s_mpi_coll_description_t mpi_coll_alltoall_description[] = {
   {"default",
@@ -80,7 +80,7 @@ COLL_ALLTOALLS(COLL_DESCRIPTION, COLL_COMMA),
   {"basic_linear",
    "Alltoall basic linear (SG) collective",
    reinterpret_cast<void*>(&smpi_coll_tuned_alltoall_basic_linear)},
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_alltoallv_description[] = {
@@ -88,7 +88,7 @@ s_mpi_coll_description_t mpi_coll_alltoallv_description[] = {
    "Ompi alltoallv default collective",
    reinterpret_cast<void*>(&smpi_coll_basic_alltoallv)},
 COLL_ALLTOALLVS(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_bcast_description[] = {
@@ -96,7 +96,7 @@ s_mpi_coll_description_t mpi_coll_bcast_description[] = {
    "bcast default collective ",
    reinterpret_cast<void*>(&smpi_mpi_bcast)},
 COLL_BCASTS(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 s_mpi_coll_description_t mpi_coll_reduce_description[] = {
@@ -104,7 +104,7 @@ s_mpi_coll_description_t mpi_coll_reduce_description[] = {
    "reduce default collective",
    reinterpret_cast<void*>(&smpi_mpi_reduce)},
 COLL_REDUCES(COLL_DESCRIPTION, COLL_COMMA),
-  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
 };
 
 
@@ -122,9 +122,9 @@ void coll_help(const char *category, s_mpi_coll_description_t * table)
 int find_coll_description(s_mpi_coll_description_t * table,
                            char *name, const char *desc)
 {
-  char *name_list = NULL;
+  char *name_list = nullptr;
   int selector_on=0;
-  if (name==NULL || name[0] == '\0') {
+  if (name==nullptr || name[0] == '\0') {
     //no argument provided, use active selector's algorithm
     name=static_cast<char*>(xbt_cfg_get_string("smpi/coll-selector"));
     selector_on=1;
@@ -168,11 +168,10 @@ int (*mpi_coll_reduce_fun)(void *buf, void *rbuf, int count, MPI_Datatype dataty
 int (*mpi_coll_reduce_scatter_fun)(void *sbuf, void *rbuf, int *rcounts,MPI_Datatype dtype,MPI_Op  op,MPI_Comm  comm);
 int (*mpi_coll_scatter_fun)(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbuf, int recvcount, MPI_Datatype recvtype,int root, MPI_Comm comm);
 int (*mpi_coll_barrier_fun)(MPI_Comm comm);
-void (*smpi_coll_cleanup_callback)(void);
+void (*smpi_coll_cleanup_callback)();
 
 
-int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount,
-                                   MPI_Datatype sendtype, void *recvbuf,
+int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf,
                                    int recvcount, MPI_Datatype recvtype,
                                    MPI_Comm comm)
 {
@@ -181,19 +180,13 @@ int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount,
   sendsize = smpi_datatype_size(sendtype) * sendcount;  
   if (sendsize < 200 && size > 12) {
     return
-        smpi_coll_tuned_alltoall_bruck(sendbuf, sendcount, sendtype,
-                                       recvbuf, recvcount, recvtype,
-                                       comm);
+        smpi_coll_tuned_alltoall_bruck(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
   } else if (sendsize < 3000) {
     return
-        smpi_coll_tuned_alltoall_basic_linear(sendbuf, sendcount,
-                                              sendtype, recvbuf,
-                                              recvcount, recvtype, comm);
+        smpi_coll_tuned_alltoall_basic_linear(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
   } else {
     return
-        smpi_coll_tuned_alltoall_ring(sendbuf, sendcount, sendtype,
-                                      recvbuf, recvcount, recvtype,
-                                      comm);
+        smpi_coll_tuned_alltoall_ring(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
   }
 }
 
@@ -348,10 +341,8 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
   smpi_datatype_extent(recvtype, &lb, &recvext);
   /* Local copy from self */
   err =
-      smpi_datatype_copy(static_cast<char *>(sendbuf) + senddisps[rank] * sendext, 
-                         sendcounts[rank], sendtype,
-                         static_cast<char *>(recvbuf) + recvdisps[rank] * recvext, 
-                         recvcounts[rank], recvtype);
+      smpi_datatype_copy(static_cast<char *>(sendbuf) + senddisps[rank] * sendext, sendcounts[rank], sendtype,
+                         static_cast<char *>(recvbuf) + recvdisps[rank] * recvext, recvcounts[rank], recvtype);
   if (err == MPI_SUCCESS && size > 1) {
     /* Initiate all send/recv to/from others. */
     requests = xbt_new(MPI_Request, 2 * (size - 1));
@@ -364,9 +355,7 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
                           recvcounts[i], recvtype, i, system_tag, comm);
         count++;
       }else{
-        XBT_DEBUG
-            ("<%d> skip request creation [src = %d, recvcounts[src] = %d]",
-             rank, i, recvcounts[i]);
+        XBT_DEBUG("<%d> skip request creation [src = %d, recvcounts[src] = %d]", rank, i, recvcounts[i]);
       }
     }
     /* Now create all sends  */
@@ -377,9 +366,7 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
                           sendcounts[i], sendtype, i, system_tag, comm);
       count++;
       }else{
-        XBT_DEBUG
-            ("<%d> skip request creation [dst = %d, sendcounts[dst] = %d]",
-             rank, i, sendcounts[i]);
+        XBT_DEBUG("<%d> skip request creation [dst = %d, sendcounts[dst] = %d]", rank, i, sendcounts[i]);
       }
     }
     /* Wait for them all. */