MPI_STATUS_IGNORE = null, actually.

[simgrid.git] / 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 32e1750..ca7484f 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_file.cpp
+++ b/src/smpi/bindings/smpi_pmpi_file.cpp
@@ -9,14 +9,39 @@
 #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 CHECK_WRONLY(fh)                                                                                               \
+  if ((fh)->flags() & MPI_MODE_WRONLY)                                                                                 \
+    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)                                                                                              \
+
+#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)                                                                                              \
 
 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();
@@ -32,8 +57,7 @@ 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;
@@ -41,26 +65,6 @@ int PMPI_File_close(MPI_File *fh){
   return ret;
 }
 
-
-#define CHECK_OFFSET(offset)                                                                                           \
-  if ((offset) < 0)                                                                                                    \
-    return MPI_ERR_DISP;
-#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(1, fh)
   smpi_bench_end();
@@ -78,8 +82,8 @@ int PMPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence){
 }
 
 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();
@@ -88,8 +92,7 @@ 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(1, fh)
-  if (offset==nullptr)
-    return MPI_ERR_DISP;
+  CHECK_NULL(2, MPI_ERR_DISP, offset)
   smpi_bench_end();
   int ret = fh->get_position_shared(offset);
   smpi_bench_begin();
@@ -97,12 +100,8 @@ 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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
   CHECK_FLAGS(fh)
+  CHECK_WRONLY(fh)
   PASS_ZEROCOUNT(count)
   smpi_bench_end();
   int rank_traced = simgrid::s4u::this_actor::get_pid();
@@ -114,12 +113,9 @@ 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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
+  CHECK_WRONLY(fh)
   PASS_ZEROCOUNT(count)
   smpi_bench_end();
   int rank_traced = simgrid::s4u::this_actor::get_pid();
@@ -132,11 +128,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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
   CHECK_RDONLY(fh)
   PASS_ZEROCOUNT(count)
@@ -150,11 +142,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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
   CHECK_RDONLY(fh)
   PASS_ZEROCOUNT(count)
@@ -169,12 +157,9 @@ 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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
+  CHECK_WRONLY(fh)
   smpi_bench_end();
   int rank_traced = simgrid::s4u::this_actor::get_pid();
   TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read_all", count * datatype->size()));
@@ -185,12 +170,9 @@ 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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
+  CHECK_WRONLY(fh)
   smpi_bench_end();
   int rank_traced = simgrid::s4u::this_actor::get_pid();
   TRACE_smpi_comm_in(rank_traced, __func__,
@@ -202,11 +184,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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
   CHECK_RDONLY(fh)
   smpi_bench_end();
@@ -219,11 +197,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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
   CHECK_RDONLY(fh)
   smpi_bench_end();
@@ -237,13 +211,9 @@ 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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_OFFSET(offset)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUTS
   CHECK_FLAGS(fh)
+  CHECK_WRONLY(fh)
   PASS_ZEROCOUNT(count);
   smpi_bench_end();
   int rank_traced = simgrid::s4u::this_actor::get_pid();
@@ -258,13 +228,9 @@ 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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_OFFSET(offset)
-  CHECK_COUNT(3, count)
-  CHECK_TYPE(4, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUT_OFFSET
   CHECK_FLAGS(fh)
+  CHECK_WRONLY(fh)
   smpi_bench_end();
   int rank_traced = simgrid::s4u::this_actor::get_pid();
   TRACE_smpi_comm_in(rank_traced, __func__,
@@ -279,12 +245,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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_OFFSET(offset)
-  CHECK_COUNT(4, count)
-  CHECK_TYPE(5, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUT_OFFSET
   CHECK_FLAGS(fh)
   CHECK_RDONLY(fh)
   PASS_ZEROCOUNT(count);
@@ -301,12 +262,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(1, fh)
-  CHECK_BUFFER(2, buf, count)
-  CHECK_OFFSET(offset)
-  CHECK_COUNT(4, count)
-  CHECK_TYPE(5, datatype)
-  CHECK_STATUS(status)
+  CHECK_FILE_INPUT_OFFSET
   CHECK_FLAGS(fh)
   CHECK_RDONLY(fh)
   smpi_bench_end();