X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe9f13ea487593ec11c6af50d8150a6743c84114..c317a567f6e72c7e5619b9a636373f6b6fa8f2b6:/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 3680ca9417..9f51bf2fb5 100644 --- a/src/smpi/bindings/smpi_pmpi_file.cpp +++ b/src/smpi/bindings/smpi_pmpi_file.cpp @@ -8,13 +8,39 @@ #include "smpi_file.hpp" #include "smpi_datatype.hpp" +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); +#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_INPUTS \ + CHECK_FILE(1, fh) \ + CHECK_BUFFER(2, buf, count) \ + CHECK_COUNT(3, count) \ + CHECK_TYPE(4, datatype) \ + CHECK_NULL(5, MPI_ERR_ARG, status) + +#define CHECK_FILE_INPUT_OFFSET \ + CHECK_FILE(1, fh) \ + CHECK_BUFFER(2, buf, count) \ + CHECK_OFFSET(3, offset) \ + CHECK_COUNT(4, count) \ + CHECK_TYPE(5, datatype) \ + CHECK_NULL(6, MPI_ERR_ARG, status) + extern MPI_Errhandler SMPI_default_File_Errhandler; int PMPI_File_open(MPI_Comm comm, const char *filename, int amode, MPI_Info info, MPI_File *fh){ - if (comm == MPI_COMM_NULL) - return MPI_ERR_COMM; - if (filename == nullptr) - return MPI_ERR_FILE; + CHECK_COMM(1) + CHECK_NULL(2, MPI_ERR_FILE, filename) if (amode < 0) return MPI_ERR_AMODE; smpi_bench_end(); @@ -30,66 +56,33 @@ int PMPI_File_open(MPI_Comm comm, const char *filename, int amode, MPI_Info info } int PMPI_File_close(MPI_File *fh){ - if (fh==nullptr) - return MPI_ERR_ARG; + CHECK_NULL(2, MPI_ERR_ARG, fh) smpi_bench_end(); int ret = simgrid::smpi::File::close(fh); *fh = MPI_FILE_NULL; 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; \ - } int PMPI_File_seek(MPI_File fh, MPI_Offset offset, int whence){ - CHECK_FILE(fh); + CHECK_FILE(1, 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){ - CHECK_FILE(fh) + CHECK_FILE(1, fh) smpi_bench_end(); int ret = fh->seek_shared(offset,whence); smpi_bench_begin(); return ret; - } int PMPI_File_get_position(MPI_File fh, MPI_Offset* offset){ - if (offset==nullptr) - return MPI_ERR_DISP; + CHECK_FILE(1, fh) + CHECK_NULL(2, MPI_ERR_DISP, offset) smpi_bench_end(); int ret = fh->get_position(offset); smpi_bench_begin(); @@ -97,9 +90,8 @@ int PMPI_File_get_position(MPI_File fh, MPI_Offset* offset){ } int PMPI_File_get_position_shared(MPI_File fh, MPI_Offset* offset){ - CHECK_FILE(fh) - if (offset==nullptr) - return MPI_ERR_DISP; + CHECK_FILE(1, fh) + CHECK_NULL(2, MPI_ERR_DISP, offset) smpi_bench_end(); int ret = fh->get_position_shared(offset); smpi_bench_begin(); @@ -107,11 +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_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) CHECK_FLAGS(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); @@ -124,11 +111,7 @@ int PMPI_File_read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_ } int PMPI_File_read_shared(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); @@ -142,11 +125,7 @@ int PMPI_File_read_shared(MPI_File fh, void *buf, int count,MPI_Datatype datatyp } int PMPI_File_write(MPI_File fh, const void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) CHECK_RDONLY(fh) PASS_ZEROCOUNT(count) @@ -160,11 +139,7 @@ int PMPI_File_write(MPI_File fh, const void *buf, int count,MPI_Datatype datatyp } int PMPI_File_write_shared(MPI_File fh, const void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) CHECK_RDONLY(fh) PASS_ZEROCOUNT(count) @@ -179,11 +154,7 @@ int PMPI_File_write_shared(MPI_File fh, const void *buf, int count,MPI_Datatype } int PMPI_File_read_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) smpi_bench_end(); int rank_traced = simgrid::s4u::this_actor::get_pid(); @@ -195,11 +166,7 @@ int PMPI_File_read_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype, } int PMPI_File_read_ordered(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) smpi_bench_end(); int rank_traced = simgrid::s4u::this_actor::get_pid(); @@ -212,11 +179,7 @@ int PMPI_File_read_ordered(MPI_File fh, void *buf, int count,MPI_Datatype dataty } int PMPI_File_write_all(MPI_File fh, const void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) CHECK_RDONLY(fh) smpi_bench_end(); @@ -229,11 +192,7 @@ int PMPI_File_write_all(MPI_File fh, const void *buf, int count,MPI_Datatype dat } int PMPI_File_write_ordered(MPI_File fh, const void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) CHECK_RDONLY(fh) smpi_bench_end(); @@ -247,12 +206,7 @@ int PMPI_File_write_ordered(MPI_File fh, const void *buf, int count,MPI_Datatype } int PMPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_OFFSET(offset) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUTS CHECK_FLAGS(fh) PASS_ZEROCOUNT(count); smpi_bench_end(); @@ -268,12 +222,7 @@ int PMPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_D } int PMPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_OFFSET(offset) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUT_OFFSET CHECK_FLAGS(fh) smpi_bench_end(); int rank_traced = simgrid::s4u::this_actor::get_pid(); @@ -289,12 +238,7 @@ int PMPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,M } int PMPI_File_write_at(MPI_File fh, MPI_Offset offset, const void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_OFFSET(offset) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUT_OFFSET CHECK_FLAGS(fh) CHECK_RDONLY(fh) PASS_ZEROCOUNT(count); @@ -311,12 +255,7 @@ int PMPI_File_write_at(MPI_File fh, MPI_Offset offset, const void *buf, int coun } int PMPI_File_write_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count,MPI_Datatype datatype, MPI_Status *status){ - CHECK_FILE(fh) - CHECK_BUFFER(buf, count) - CHECK_OFFSET(offset) - CHECK_COUNT(count) - CHECK_DATATYPE(datatype, count) - CHECK_STATUS(status) + CHECK_FILE_INPUT_OFFSET CHECK_FLAGS(fh) CHECK_RDONLY(fh) smpi_bench_end(); @@ -343,42 +282,42 @@ int PMPI_File_delete(const char *filename, MPI_Info info){ int PMPI_File_get_info(MPI_File fh, MPI_Info* info) { - CHECK_FILE(fh) + CHECK_FILE(1, fh) *info = fh->info(); return MPI_SUCCESS; } int PMPI_File_set_info(MPI_File fh, MPI_Info info) { - CHECK_FILE(fh) + CHECK_FILE(1, fh) fh->set_info(info); return MPI_SUCCESS; } int PMPI_File_get_size(MPI_File fh, MPI_Offset* size) { - CHECK_FILE(fh) + CHECK_FILE(1, fh) *size = fh->size(); return MPI_SUCCESS; } int PMPI_File_get_amode(MPI_File fh, int* amode) { - CHECK_FILE(fh) + CHECK_FILE(1, fh) *amode = fh->flags(); return MPI_SUCCESS; } int PMPI_File_get_group(MPI_File fh, MPI_Group* group) { - CHECK_FILE(fh) + CHECK_FILE(1, fh) *group = fh->comm()->group(); return MPI_SUCCESS; } int PMPI_File_sync(MPI_File fh) { - CHECK_FILE(fh) + CHECK_FILE(1, fh) fh->sync(); return MPI_SUCCESS; }