X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5089a0a98b27f5eeee62321dff4f025f1648f025..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp diff --git a/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp b/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp index 866ab8a966..05da8517e7 100644 --- a/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp +++ b/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. +/* Copyright (c) 2013-2021. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -57,7 +57,7 @@ static int MPIR_Reduce_knomial_trace(int root, int reduce_knomial_factor, int mask=0x1, k, comm_size, src, rank, relative_rank, lroot=0; int orig_mask=0x1; int recv_iter=0, send_iter=0; - int *knomial_reduce_src_array=NULL; + int* knomial_reduce_src_array = nullptr; comm_size = comm->size(); rank = comm->rank(); @@ -128,14 +128,14 @@ int reduce__mvapich2_knomial( MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - int rank, is_commutative; + int rank; int src, k; MPI_Request send_request; int index=0; MPI_Aint true_lb, true_extent, extent; MPI_Status status; int recv_iter=0, dst=-1, expected_send_count, expected_recv_count; - int *src_array=NULL; + int* src_array = nullptr; if (count == 0) return MPI_SUCCESS; @@ -146,7 +146,7 @@ int reduce__mvapich2_knomial( datatype->extent(&true_lb, &true_extent); extent = datatype->get_extent(); - is_commutative = (op==MPI_OP_NULL || op->is_commutative()); + bool is_commutative = (op == MPI_OP_NULL || op->is_commutative()); if (rank != root) { recvbuf = (void*)smpi_get_tmp_recvbuffer(count * std::max(extent, true_extent)); @@ -173,8 +173,8 @@ int reduce__mvapich2_knomial( &dst, &expected_send_count, &expected_recv_count, &src_array); if(expected_recv_count > 0 ) { - unsigned char** tmp_buf = new unsigned char*[expected_recv_count]; - MPI_Request* requests = new MPI_Request[expected_recv_count]; + auto** tmp_buf = new unsigned char*[expected_recv_count]; + auto* requests = new MPI_Request[expected_recv_count]; for (k = 0; k < expected_recv_count; k++) { tmp_buf[k] = smpi_get_tmp_sendbuffer(count * std::max(extent, true_extent)); tmp_buf[k] = tmp_buf[k] - true_lb; @@ -207,7 +207,7 @@ int reduce__mvapich2_knomial( delete[] requests; } - if(src_array != NULL) { + if (src_array != nullptr) { delete[] src_array; }