From c317a567f6e72c7e5619b9a636373f6b6fa8f2b6 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 10 Dec 2019 09:56:35 +0100 Subject: [PATCH] please sonar and codefactor --- src/smpi/bindings/smpi_pmpi_file.cpp | 1 - src/smpi/include/private.hpp | 33 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/smpi/bindings/smpi_pmpi_file.cpp b/src/smpi/bindings/smpi_pmpi_file.cpp index 1f6e472f15..9f51bf2fb5 100644 --- a/src/smpi/bindings/smpi_pmpi_file.cpp +++ b/src/smpi/bindings/smpi_pmpi_file.cpp @@ -99,7 +99,6 @@ int PMPI_File_get_position_shared(MPI_File fh, MPI_Offset* offset){ } int PMPI_File_read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FLAGS(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index a4e1fdab68..ed2dbcea44 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -501,20 +501,20 @@ XBT_PRIVATE void private_execute_flops(double flops); #define CHECK_ARGS(test, errcode, ...) \ if (test) { \ - if((errcode) != MPI_SUCCESS) \ + if((errcode) != MPI_SUCCESS) \ XBT_WARN(__VA_ARGS__); \ return (errcode); \ } #define CHECK_MPI_NULL(num, val, err, ptr) \ - CHECK_ARGS((ptr) == (val), (err), \ - "%s: param %d %s cannot be %s", __func__, (num), #ptr, #val); + CHECK_ARGS((ptr) == (val), (err), \ + "%s: param %d %s cannot be %s", __func__, (num), _XBT_STRINGIFY(ptr), _XBT_STRINGIFY(val)); #define CHECK_NULL(num,err,buf) \ - CHECK_ARGS((buf) == nullptr, (err), \ - "%s: param %d %s cannot be NULL", __func__, (num), #buf); + CHECK_ARGS((buf) == nullptr, (err), \ + "%s: param %d %s cannot be NULL", __func__, (num), _XBT_STRINGIFY(buf)); #define CHECK_NEGATIVE(num, err, val) \ - CHECK_ARGS((val) < 0, (err), \ - "%s: param %d %s cannot be negative", __func__, (num), #val); + CHECK_ARGS((val) < 0, (err), \ + "%s: param %d %s cannot be negative", __func__, (num), _XBT_STRINGIFY(val)); #define CHECK_COMM2(num, comm) \ CHECK_MPI_NULL((num), MPI_COMM_NULL, MPI_ERR_COMM, (comm)) #define CHECK_COMM(num) \ @@ -523,26 +523,26 @@ XBT_PRIVATE void private_execute_flops(double flops); CHECK_ARGS(request == nullptr, MPI_ERR_REQUEST, \ "%s: param %d request cannot be NULL",__func__, (num)); #define CHECK_BUFFER(num,buf,count) \ - CHECK_ARGS((buf) == nullptr && (count) > 0, MPI_ERR_BUFFER, \ - "%s: param %d %s cannot be NULL if %s > 0",__func__, (num), #buf, #count); -#define CHECK_COUNT(num, count) \ + CHECK_ARGS((buf) == nullptr && (count) > 0, MPI_ERR_BUFFER, \ + "%s: param %d %s cannot be NULL if %s > 0",__func__, (num), _XBT_STRINGIFY(buf), _XBT_STRINGIFY(count)); +#define CHECK_COUNT(num, count) \ CHECK_NEGATIVE((num), MPI_ERR_COUNT, (count)) #define CHECK_TYPE(num, datatype) \ - CHECK_ARGS(((datatype) == MPI_DATATYPE_NULL|| not (datatype)->is_valid()), MPI_ERR_TYPE, \ - "%s: param %d %s cannot be MPI_DATATYPE_NULL or invalid", __func__, (num), #datatype); + CHECK_ARGS(((datatype) == MPI_DATATYPE_NULL|| not (datatype)->is_valid()), MPI_ERR_TYPE, \ + "%s: param %d %s cannot be MPI_DATATYPE_NULL or invalid", __func__, (num), _XBT_STRINGIFY(datatype)); #define CHECK_OP(num) \ CHECK_MPI_NULL((num), MPI_OP_NULL, MPI_ERR_OP, op) #define CHECK_ROOT(num)\ CHECK_ARGS((root < 0 || root >= comm->size()), MPI_ERR_ROOT, \ - "%s: param %d root (=%d) cannot be negative or larger than communicator size (=%d)", __func__, (num), root, \ - comm->size()); + "%s: param %d root (=%d) cannot be negative or larger than communicator size (=%d)", __func__, (num), \ + root, comm->size()); #define CHECK_PROC(num,proc) \ CHECK_MPI_NULL((num), MPI_PROC_NULL, MPI_SUCCESS, (proc)) #define CHECK_INFO(num,info) \ CHECK_MPI_NULL((num), MPI_INFO_NULL, MPI_ERR_INFO, (info)) #define CHECK_TAG(num,tag) \ CHECK_ARGS(((tag) < 0 && (tag) != MPI_ANY_TAG), MPI_ERR_TAG, \ - "%s: param %d %s (=%d) cannot be negative", __func__, (num), #tag, (tag)); + "%s: param %d %s (=%d) cannot be negative", __func__, (num), _XBT_STRINGIFY(tag), (tag)); #define CHECK_FILE(num, fh) \ CHECK_MPI_NULL((num), MPI_FILE_NULL, MPI_ERR_FILE, (fh)) #define CHECK_OFFSET(num, offset) \ @@ -553,5 +553,6 @@ XBT_PRIVATE void private_execute_flops(double flops); CHECK_MPI_NULL((num), MPI_WIN_NULL, MPI_ERR_WIN, (win)) #define CHECK_RANK(num, rank, comm) \ CHECK_ARGS(((rank) >= (comm)->group()->size() || (rank) <0), MPI_ERR_RANK, \ - "%s: param %d %s (=%d) cannot be < 0 or > %d", __func__, (num), #rank, (rank), (comm)->group()->size() ); + "%s: param %d %s (=%d) cannot be < 0 or > %d", __func__, (num), _XBT_STRINGIFY(rank), \ + (rank), (comm)->group()->size() ); #endif -- 2.20.1