MPI_File_read_shared, MPI_File_write_shared, MPI_File_read_ordered, MPI_File_write_or...

[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 1317eb7..ce31d25 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_file.cpp
+++ b/src/smpi/bindings/smpi_pmpi_file.cpp
@@ -61,6 +61,15 @@ int PMPI_File_seek(MPI_File fh, MPI_Offset offset, int whence){
   }\r
 }\r
 \r
+int PMPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence){\r
+  CHECK_FILE(fh);\r
+  else {\r
+    smpi_bench_end();\r
+    int ret = fh->seek_shared(offset,whence);\r
+    smpi_bench_begin();\r
+    return ret;\r
+  }\r
+}\r
 \r
 int PMPI_File_get_position(MPI_File fh, MPI_Offset* offset){\r
   CHECK_FILE(fh);\r
@@ -74,6 +83,18 @@ int PMPI_File_get_position(MPI_File fh, MPI_Offset* offset){
   }\r
 }\r
 \r
+int PMPI_File_get_position_shared(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_shared(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
   CHECK_FILE(fh);
   CHECK_BUFFER(buf, count);\r
@@ -93,6 +114,25 @@ int PMPI_File_read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_
   }\r
 }\r
 \r
+int PMPI_File_read_shared(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);\r
+  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_shared", static_cast<double>(count*datatype->size())));\r
+    int ret = simgrid::smpi::File::read_shared(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
@@ -112,6 +152,25 @@ int PMPI_File_write(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI
   }\r
 }\r
 \r
+int PMPI_File_write_shared(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);\r
+  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_shared", static_cast<double>(count*datatype->size())));\r
+    int ret = simgrid::smpi::File::write_shared(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
@@ -130,6 +189,24 @@ int PMPI_File_read_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype,
   }\r
 }\r
 \r
+int PMPI_File_read_ordered(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);\r
+  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_ordered", static_cast<double>(count*datatype->size())));\r
+    int ret = simgrid::smpi::File::read_ordered(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_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
   CHECK_FILE(fh);
   CHECK_BUFFER(buf, count);\r
@@ -148,6 +225,24 @@ int PMPI_File_write_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype,
   }\r
 }\r
 \r
+int PMPI_File_write_ordered(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){\r
+  CHECK_FILE(fh);\r
+  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_ordered", static_cast<double>(count*datatype->size())));\r
+    int ret = simgrid::smpi::File::write_ordered(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(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