Test using macros for arguments checking, saves some duplicated lines.

[simgrid.git] / src / smpi / mpi / smpi_file.cpp

diff --git a/src/smpi/mpi/smpi_file.cpp b/src/smpi/mpi/smpi_file.cpp
index 35e36d4..1beffe9 100644 (file)
--- a/src/smpi/mpi/smpi_file.cpp
+++ b/src/smpi/mpi/smpi_file.cpp
@@ -61,16 +61,20 @@ namespace smpi{
     return MPI_SUCCESS;\r
   }\r
   \r
-  int File::read(void *buf, int count, MPI_Datatype datatype, MPI_Status *status){\r
+  int File::read(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status){\r
     //get position first as we may be doing non contiguous reads and it will probably be updated badly\r
-    MPI_Offset position = file_->tell();\r
+    MPI_Offset position = fh->file_->tell();\r
     MPI_Offset movesize = datatype->get_extent()*count;\r
     MPI_Offset readsize = datatype->size()*count;\r
-    XBT_DEBUG("Position before read in MPI_File %s : %llu",file_->get_path(),file_->tell());\r
-    MPI_Offset read = file_->read(readsize);\r
-    XBT_DEBUG("Read in MPI_File %s, %lld bytes read, readsize %lld bytes, movesize %lld", file_->get_path(), read, readsize, movesize);\r
+    XBT_DEBUG("Position before read in MPI_File %s : %llu",fh->file_->get_path(),fh->file_->tell());\r
+    MPI_Offset read = fh->file_->read(readsize);\r
+    XBT_DEBUG("Read in MPI_File %s, %lld bytes read, readsize %lld bytes, movesize %lld", fh->file_->get_path(), read, readsize, movesize);\r
     if(readsize!=movesize){\r
-      file_->seek(position+movesize, SEEK_SET);\r
+      fh->file_->seek(position+movesize, SEEK_SET);\r
+    }\r
+    XBT_DEBUG("Position after read in MPI_File %s : %llu",fh->file_->get_path(), fh->file_->tell());\r
+    return MPI_SUCCESS;\r
+  }\r
     }\r
     XBT_DEBUG("Position after read in MPI_File %s : %llu",file_->get_path(), file_->tell());\r
     return MPI_SUCCESS;\r