MPI_File_set_info, MPI_File_get_info, MPI_File_get_position

[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 5c14cdf..1317eb7 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_file.cpp
+++ b/src/smpi/bindings/smpi_pmpi_file.cpp
@@ -42,11 +42,18 @@ int PMPI_File_close(MPI_File *fh){
     return ret;\r
   }\r
 }\r
+#define CHECK_FILE(fh) if(fh==MPI_FILE_NULL) return MPI_ERR_FILE\r
+#define CHECK_BUFFER(buf, count)  else if (buf==nullptr && count > 0) return MPI_ERR_BUFFER\r
+#define CHECK_COUNT(count)  else if (count < 0) return MPI_ERR_COUNT\r
+#define CHECK_OFFSET(offset)  else if (offset < 0) return MPI_ERR_DISP\r
+#define PASS_ZEROCOUNT(count)  else if (count == 0) return MPI_SUCCESS\r
+#define CHECK_DATATYPE(datatype, count) else if (datatype == MPI_DATATYPE_NULL && count > 0) return MPI_ERR_TYPE\r
+#define CHECK_STATUS(status) else if (status == nullptr) return MPI_ERR_ARG\r
+#define CHECK_FLAGS(fh) else if (fh->flags() & MPI_MODE_SEQUENTIAL) return MPI_ERR_AMODE\r
 \r
 int PMPI_File_seek(MPI_File fh, MPI_Offset offset, int whence){\r
-  if (fh==MPI_FILE_NULL){\r
-    return MPI_ERR_FILE;\r
-  } else {\r
+  CHECK_FILE(fh);
+  else {\r
     smpi_bench_end();\r
     int ret = fh->seek(offset,whence);\r
     smpi_bench_begin();\r
@@ -54,30 +61,182 @@ int PMPI_File_seek(MPI_File fh, MPI_Offset offset, int whence){
   }\r
 }\r
 \r
+\r
+int PMPI_File_get_position(MPI_File fh, MPI_Offset* offset){\r
+  CHECK_FILE(fh);\r
+  else if (offset==nullptr)\r
+    return MPI_ERR_DISP;\r
+  else {\r
+    smpi_bench_end();\r
+    int ret = fh->get_position(offset);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
+\r
 int PMPI_File_read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
-  if (fh==MPI_FILE_NULL){\r
-    return MPI_ERR_FILE;\r
-  } else if (buf==nullptr && count > 0){\r
-    return MPI_ERR_BUFFER;\r
-  } else if ( count < 0){\r
-    return MPI_ERR_COUNT;\r
-  } else if ( datatype == MPI_DATATYPE_NULL && count > 0){\r
-    return MPI_ERR_TYPE;\r
-  } else if (status == nullptr){\r
-    return MPI_ERR_ARG;\r
-  } else if (fh->flags() & MPI_MODE_SEQUENTIAL){\r
-    return MPI_ERR_AMODE;\r
-  } else {\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_COUNT(count);\r
+  PASS_ZEROCOUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
     smpi_bench_end();\r
     int rank_traced = simgrid::s4u::this_actor::get_pid();\r
     TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read", static_cast<double>(count*datatype->size())));\r
-    int ret = fh->read(buf, count, datatype, status);\r
+    int ret = simgrid::smpi::File::read(fh, buf, count, datatype, status);\r
+    TRACE_smpi_comm_out(rank_traced);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
+\r
+int PMPI_File_write(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_COUNT(count);\r
+  PASS_ZEROCOUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int rank_traced = simgrid::s4u::this_actor::get_pid();\r
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write", static_cast<double>(count*datatype->size())));\r
+    int ret = simgrid::smpi::File::write(fh, buf, count, datatype, status);\r
     TRACE_smpi_comm_out(rank_traced);\r
     smpi_bench_begin();\r
     return ret;\r
   }\r
 }\r
 \r
+int PMPI_File_read_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_COUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int rank_traced = simgrid::s4u::this_actor::get_pid();\r
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read_all", static_cast<double>(count*datatype->size())));\r
+    int ret = fh->op_all<simgrid::smpi::File::read>(buf, count, datatype, status);\r
+    TRACE_smpi_comm_out(rank_traced);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
+\r
+int PMPI_File_write_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_COUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int rank_traced = simgrid::s4u::this_actor::get_pid();\r
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write_all", static_cast<double>(count*datatype->size())));\r
+    int ret = fh->op_all<simgrid::smpi::File::write>(buf, count, datatype, status);\r
+    TRACE_smpi_comm_out(rank_traced);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
+\r
+int PMPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_OFFSET(offset);\r
+  CHECK_COUNT(count);\r
+  PASS_ZEROCOUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int rank_traced = simgrid::s4u::this_actor::get_pid();\r
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read", static_cast<double>(count*datatype->size())));\r
+    int ret = fh->seek(offset,SEEK_SET);\r
+    if(ret!=MPI_SUCCESS)\r
+      return ret;\r
+    ret = simgrid::smpi::File::read(fh, buf, count, datatype, status);\r
+    TRACE_smpi_comm_out(rank_traced);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
+\r
+int PMPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_OFFSET(offset);\r
+  CHECK_COUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int rank_traced = simgrid::s4u::this_actor::get_pid();\r
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read_at_all", static_cast<double>(count*datatype->size())));\r
+    int ret = fh->seek(offset,SEEK_SET);\r
+    if(ret!=MPI_SUCCESS)\r
+      return ret;\r
+    ret = fh->op_all<simgrid::smpi::File::read>(buf, count, datatype, status);\r
+    TRACE_smpi_comm_out(rank_traced);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
+\r
+int PMPI_File_write_at(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_OFFSET(offset);\r
+  CHECK_COUNT(count);\r
+  PASS_ZEROCOUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int rank_traced = simgrid::s4u::this_actor::get_pid();\r
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write", static_cast<double>(count*datatype->size())));\r
+    int ret = fh->seek(offset,SEEK_SET);\r
+    if(ret!=MPI_SUCCESS)\r
+      return ret;\r
+    ret = simgrid::smpi::File::write(fh, buf, count, datatype, status);\r
+    TRACE_smpi_comm_out(rank_traced);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
+\r
+int PMPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);\r
+  CHECK_OFFSET(offset);\r
+  CHECK_COUNT(count);\r
+  CHECK_DATATYPE(datatype, count);\r
+  CHECK_STATUS(status);\r
+  CHECK_FLAGS(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int rank_traced = simgrid::s4u::this_actor::get_pid();\r
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write_at_all", static_cast<double>(count*datatype->size())));\r
+    int ret = fh->seek(offset,SEEK_SET);\r
+    if(ret!=MPI_SUCCESS)\r
+      return ret;\r
+    ret = fh->op_all<simgrid::smpi::File::write>(buf, count, datatype, status);\r
+    TRACE_smpi_comm_out(rank_traced);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
 \r
 int PMPI_File_delete(char *filename, MPI_Info info){\r
   if (filename == nullptr) {\r
@@ -90,3 +249,20 @@ int PMPI_File_delete(char *filename, MPI_Info info){
   }\r
 }\r
 \r
+int PMPI_File_get_info(MPI_File  fh, MPI_Info* info)\r
+{\r
+  CHECK_FILE(fh);\r
+  else {\r
+    *info = fh->info();\r
+    return MPI_SUCCESS;\r
+  }\r
+}\r
+\r
+int PMPI_File_set_info(MPI_File  fh, MPI_Info info)\r
+{\r
+  CHECK_FILE(fh);\r
+  else {\r
+    fh->set_info(info);\r
+    return MPI_SUCCESS;\r
+  }\r
+}
\ No newline at end of file