X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43f7ca1cac5ab1858e318fdd6239d0a0c3b3d893..6633f5c4d1b7d52fa54306ee3fb7eb573daeb274:/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp diff --git a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp index 6b304ade5f..1a3cb9b2bd 100644 --- a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp +++ b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp @@ -1,9 +1,9 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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. */ -#include "../colls_private.h" +#include "../colls_private.hpp" #include "smpi_status.hpp" /***************************************************************************** @@ -78,7 +78,7 @@ Coll_bcast_scatter_LR_allgather::bcast(void *buff, int count, MPI_Status status; int i, src, dst, rank, num_procs; int mask, relative_rank, curr_size, recv_size, send_size, nbytes; - int scatter_size, left, right, next_src, *recv_counts, *disps; + int scatter_size, left, right, next_src; int tag = COLL_TAG_BCAST; rank = comm->rank(); @@ -139,8 +139,8 @@ Coll_bcast_scatter_LR_allgather::bcast(void *buff, int count, } // done scatter now do allgather - recv_counts = (int *) xbt_malloc(sizeof(int) * num_procs); - disps = (int *) xbt_malloc(sizeof(int) * num_procs); + int* recv_counts = new int[num_procs]; + int* disps = new int[num_procs]; for (i = 0; i < num_procs; i++) { recv_counts[i] = nbytes - i * scatter_size; @@ -172,9 +172,8 @@ Coll_bcast_scatter_LR_allgather::bcast(void *buff, int count, next_src = (num_procs + next_src - 1) % num_procs; } - - free(recv_counts); - free(disps); + delete[] recv_counts; + delete[] disps; return MPI_SUCCESS; }