X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db851eaf612a7822372da53b791b396cbec88a70..48e3830dd2ccba2a1123fa10828934b28d0d4c02:/src/smpi/bindings/smpi_pmpi_file.cpp diff --git a/src/smpi/bindings/smpi_pmpi_file.cpp b/src/smpi/bindings/smpi_pmpi_file.cpp index 41e1a383bd..d8a1ceb03c 100644 --- a/src/smpi/bindings/smpi_pmpi_file.cpp +++ b/src/smpi/bindings/smpi_pmpi_file.cpp @@ -38,27 +38,43 @@ int PMPI_File_close(MPI_File *fh){ smpi_bench_begin(); return ret; } -#define CHECK_FILE(fh) if(fh==MPI_FILE_NULL) return MPI_ERR_FILE; -#define CHECK_BUFFER(buf, count) if (buf==nullptr && count > 0) return MPI_ERR_BUFFER; -#define CHECK_COUNT(count) if (count < 0) return MPI_ERR_COUNT; -#define CHECK_OFFSET(offset) if (offset < 0) return MPI_ERR_DISP; -#define CHECK_DATATYPE(datatype, count) if (datatype == MPI_DATATYPE_NULL && count > 0) return MPI_ERR_TYPE; -#define CHECK_STATUS(status) if (status == nullptr) return MPI_ERR_ARG; -#define CHECK_FLAGS(fh) if (fh->flags() & MPI_MODE_SEQUENTIAL) return MPI_ERR_AMODE; -#define CHECK_RDONLY(fh) if (fh->flags() & MPI_MODE_RDONLY ) return MPI_ERR_AMODE; - -#define PASS_ZEROCOUNT(count) if (count == 0) {\ -status->count=0;\ -return MPI_SUCCESS;\ -} +#define CHECK_FILE(fh) \ + if ((fh) == MPI_FILE_NULL) \ + return MPI_ERR_FILE; +#define CHECK_BUFFER(buf, count) \ + if ((buf) == nullptr && (count) > 0) \ + return MPI_ERR_BUFFER; +#define CHECK_COUNT(count) \ + if ((count) < 0) \ + return MPI_ERR_COUNT; +#define CHECK_OFFSET(offset) \ + if ((offset) < 0) \ + return MPI_ERR_DISP; +#define CHECK_DATATYPE(datatype, count) \ + if ((datatype) == MPI_DATATYPE_NULL && (count) > 0) \ + return MPI_ERR_TYPE; +#define CHECK_STATUS(status) \ + if ((status) == nullptr) \ + return MPI_ERR_ARG; +#define CHECK_FLAGS(fh) \ + if ((fh)->flags() & MPI_MODE_SEQUENTIAL) \ + return MPI_ERR_AMODE; +#define CHECK_RDONLY(fh) \ + if ((fh)->flags() & MPI_MODE_RDONLY) \ + return MPI_ERR_AMODE; + +#define PASS_ZEROCOUNT(count) \ + if ((count) == 0) { \ + status->count = 0; \ + return MPI_SUCCESS; \ + } int PMPI_File_seek(MPI_File fh, MPI_Offset offset, int whence){ - CHECK_FILE(fh); + CHECK_FILE(fh) smpi_bench_end(); int ret = fh->seek(offset,whence); smpi_bench_begin(); return ret; - } int PMPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence){ @@ -67,7 +83,6 @@ int PMPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence){ int ret = fh->seek_shared(offset,whence); smpi_bench_begin(); return ret; - } int PMPI_File_get_position(MPI_File fh, MPI_Offset* offset){