From: Augustin Degomme <adegomme@users.noreply.github.com>
Date: Wed, 17 Apr 2019 11:46:28 +0000 (+0200)
Subject: Read_at, Write, Write_at
X-Git-Tag: v3.22.2~101^2~13
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3905083f795c58e29ff1aed16ac7aa382d08ebb9?ds=sidebyside

Read_at, Write, Write_at
---

diff --git a/src/smpi/bindings/smpi_mpi.cpp b/src/smpi/bindings/smpi_mpi.cpp
index 83386adba5..30330d940b 100644
--- a/src/smpi/bindings/smpi_mpi.cpp
+++ b/src/smpi/bindings/smpi_mpi.cpp
@@ -358,18 +358,18 @@ UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_set_info,(MPI_File fh, MPI_Info in
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_info,(MPI_File fh, MPI_Info *info_used), (fh, info_used))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_set_view,(MPI_File fh, MPI_Offset disp, MPI_Datatype etype, MPI_Datatype filetype, char *datarep, MPI_Info info), (fh, disp, etype, filetype, datarep, info))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_view,(MPI_File fh, MPI_Offset *disp, MPI_Datatype *etype, MPI_Datatype *filetype, char *datarep), (fh, disp, etype, filetype, datarep))
-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_read_at,(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, offset, buf, count, datatype, status))
+WRAPPED_PMPI_CALL(int, MPI_File_read_at,(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, offset, buf, count, datatype, status))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_read_at_all,(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, offset, buf, count, datatype, status))
-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_write_at,(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, offset, buf, count, datatype, status))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_write_at_all,(MPI_File fh, MPI_Offset offset, void *buf,int count, MPI_Datatype datatype, MPI_Status *status), (fh, offset, buf, count, datatype, status))
+WRAPPED_PMPI_CALL(int, MPI_File_write_at,(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, offset, buf, count, datatype, status))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iread_at,(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Request *request), (fh, offset, buf, count, datatype, request))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iwrite_at,(MPI_File fh, MPI_Offset offset, void *buf,int count, MPI_Datatype datatype, MPI_Request *request), (fh, offset, buf, count, datatype, request))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iread_at_all,(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPI_Request *request), (fh, offset, buf, count, datatype, request))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iwrite_at_all,(MPI_File fh, MPI_Offset offset, void *buf,int count, MPI_Datatype datatype, MPI_Request *request), (fh, offset, buf, count, datatype, request))
 WRAPPED_PMPI_CALL(int, MPI_File_read,(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status), (fh, buf, count, datatype, status))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_read_all,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, buf, count, datatype, status))
-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_write,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, buf, count, datatype, status))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_write_all,(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status), (fh, buf, count, datatype, status))
+WRAPPED_PMPI_CALL(int, MPI_File_write,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, buf, count, datatype, status))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iread,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request), (fh, buf, count, datatype, request))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iwrite,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request), (fh, buf, count, datatype, request))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iread_all,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request), (fh, buf, count, datatype, request))
diff --git a/src/smpi/bindings/smpi_pmpi_file.cpp b/src/smpi/bindings/smpi_pmpi_file.cpp
index fe35968136..5844463120 100644
--- a/src/smpi/bindings/smpi_pmpi_file.cpp
+++ b/src/smpi/bindings/smpi_pmpi_file.cpp
@@ -79,10 +79,43 @@ int PMPI_File_read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_
     return ret;
   }
 }
+
+int PMPI_File_write(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status){
+  CHECK_FILE(fh);
+  CHECK_BUFFER(buf, count);
+  CHECK_COUNT(count);
+  PASS_ZEROCOUNT(count);
+  CHECK_DATATYPE(datatype, count);
+  CHECK_STATUS(status);
+  CHECK_FLAGS(fh);
+  else {
+    smpi_bench_end();
+    int rank_traced = simgrid::s4u::this_actor::get_pid();
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write", static_cast<double>(count*datatype->size())));
+    int ret = simgrid::smpi::File::write(fh, buf, count, datatype, status);
+    TRACE_smpi_comm_out(rank_traced);
+    smpi_bench_begin();
+    return ret;
+  }
+}
+
+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);
+  PASS_ZEROCOUNT(count);
+  CHECK_DATATYPE(datatype, count);
+  CHECK_STATUS(status);
+  CHECK_FLAGS(fh);
+  else {
     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", static_cast<double>(count*datatype->size())));
-    int ret = fh->read(buf, count, datatype, status);
+    int ret = fh->seek(offset,SEEK_SET);
+    if(ret!=MPI_SUCCESS)
+      return ret;
+    ret = simgrid::smpi::File::read(fh, buf, count, datatype, status);
     TRACE_smpi_comm_out(rank_traced);
     smpi_bench_begin();
     return ret;
@@ -90,6 +123,29 @@ int PMPI_File_read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_
 }
 
 
+int PMPI_File_write_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);
+  PASS_ZEROCOUNT(count);
+  CHECK_DATATYPE(datatype, count);
+  CHECK_STATUS(status);
+  CHECK_FLAGS(fh);
+  else {
+    smpi_bench_end();
+    int rank_traced = simgrid::s4u::this_actor::get_pid();
+    TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write", static_cast<double>(count*datatype->size())));
+    int ret = fh->seek(offset,SEEK_SET);
+    if(ret!=MPI_SUCCESS)
+      return ret;
+    ret = simgrid::smpi::File::write(fh, buf, count, datatype, status);
+    TRACE_smpi_comm_out(rank_traced);
+    smpi_bench_begin();
+    return ret;
+  }
+}
+
 int PMPI_File_delete(char *filename, MPI_Info info){
   if (filename == nullptr) {
     return MPI_ERR_FILE;
diff --git a/src/smpi/include/smpi_file.hpp b/src/smpi/include/smpi_file.hpp
index 43ecdd5b74..45552ca694 100644
--- a/src/smpi/include/smpi_file.hpp
+++ b/src/smpi/include/smpi_file.hpp
@@ -24,6 +24,7 @@ class File{
   int sync();
   int seek(MPI_Offset offset, int whence);
   static int read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status);
+  static int write(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status);
   static int close(MPI_File *fh);
   static int del(char *filename, MPI_Info info);
 };
diff --git a/src/smpi/mpi/smpi_file.cpp b/src/smpi/mpi/smpi_file.cpp
index 1beffe98af..a7cfe397f5 100644
--- a/src/smpi/mpi/smpi_file.cpp
+++ b/src/smpi/mpi/smpi_file.cpp
@@ -11,7 +11,6 @@
 #include "smpi_file.hpp"
 #include "simgrid/plugins/file_system.h"
 
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_io, smpi, "Logging specific to SMPI (RMA operations)");
 
 
@@ -75,8 +74,20 @@ namespace smpi{
     XBT_DEBUG("Position after read in MPI_File %s : %llu",fh->file_->get_path(), fh->file_->tell());
     return MPI_SUCCESS;
   }
+
+
+  int File::write(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status){
+    //get position first as we may be doing non contiguous reads and it will probably be updated badly
+    MPI_Offset position = fh->file_->tell();
+    MPI_Offset movesize = datatype->get_extent()*count;
+    MPI_Offset writesize = datatype->size()*count;
+    XBT_DEBUG("Position before write in MPI_File %s : %llu",fh->file_->get_path(),fh->file_->tell());
+    MPI_Offset write = fh->file_->write(writesize);
+    XBT_DEBUG("Write in MPI_File %s, %lld bytes read, readsize %lld bytes, movesize %lld", fh->file_->get_path(), write, writesize, movesize);
+    if(writesize!=movesize){
+      fh->file_->seek(position+movesize, SEEK_SET);
     }
-    XBT_DEBUG("Position after read in MPI_File %s : %llu",file_->get_path(), file_->tell());
+    XBT_DEBUG("Position after write in MPI_File %s : %llu",fh->file_->get_path(), fh->file_->tell());
     return MPI_SUCCESS;
   }