MPI_File_set_info, MPI_File_get_info, MPI_File_get_position

diff --git a/src/smpi/bindings/smpi_mpi.cpp b/src/smpi/bindings/smpi_mpi.cpp
index 1601883..d1fb998 100644 (file)
--- a/src/smpi/bindings/smpi_mpi.cpp
+++ b/src/smpi/bindings/smpi_mpi.cpp
@@ -354,8 +354,8 @@ UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_preallocate,(MPI_File fh, MPI_Offs
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_size,(MPI_File fh, MPI_Offset *size), (fh, size))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_group,(MPI_File fh, MPI_Group *group), (fh, group))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_amode,(MPI_File fh, int *amode), (fh, amode))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_size,(MPI_File fh, MPI_Offset *size), (fh, size))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_group,(MPI_File fh, MPI_Group *group), (fh, group))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_amode,(MPI_File fh, int *amode), (fh, amode))

-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_set_info,(MPI_File fh, MPI_Info info), (fh, info))
-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_info,(MPI_File fh, MPI_Info *info_used), (fh, info_used))
+WRAPPED_PMPI_CALL(int, MPI_File_set_info,(MPI_File fh, MPI_Info info), (fh, info))
+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))
 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_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))
 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))


@@ -375,7 +375,7 @@ UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iwrite,(MPI_File fh, void *buf, in
 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))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iwrite_all,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request), (fh, buf, count, datatype, request))
 WRAPPED_PMPI_CALL(int, MPI_File_seek,(MPI_File fh, MPI_Offset offset, int whenace), (fh, offset, whenace))
 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))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_iwrite_all,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Request *request), (fh, buf, count, datatype, request))
 WRAPPED_PMPI_CALL(int, MPI_File_seek,(MPI_File fh, MPI_Offset offset, int whenace), (fh, offset, whenace))

-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_position,(MPI_File fh, MPI_Offset *offset), (fh, offset))
+WRAPPED_PMPI_CALL(int, MPI_File_get_position,(MPI_File fh, MPI_Offset *offset), (fh, offset))

 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_get_byte_offset,(MPI_File fh, MPI_Offset offset, MPI_Offset *disp), (fh, offset, disp))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_read_shared,(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_shared,(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_get_byte_offset,(MPI_File fh, MPI_Offset offset, MPI_Offset *disp), (fh, offset, disp))
 UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_File_read_shared,(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_shared,(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status), (fh, buf, count, datatype, status))

diff --git a/src/smpi/bindings/smpi_pmpi_file.cpp b/src/smpi/bindings/smpi_pmpi_file.cpp
index 607ce16..1317eb7 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_file.cpp
+++ b/src/smpi/bindings/smpi_pmpi_file.cpp
@@ -44,10 +44,10 @@ int PMPI_File_close(MPI_File *fh){
 }\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
 }\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_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
 #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


@@ -61,6 +61,19 @@ int PMPI_File_seek(MPI_File fh, MPI_Offset offset, int whence){
   }\r
 }\r
 \r
   }\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
   CHECK_FILE(fh);
   CHECK_BUFFER(buf, count);\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


@@ -236,3 +249,20 @@ int PMPI_File_delete(char *filename, MPI_Info info){
   }\r
 }\r
 \r
   }\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

diff --git a/src/smpi/include/smpi_file.hpp b/src/smpi/include/smpi_file.hpp
index 7b2cdff..7c89f8b 100644 (file)
--- a/src/smpi/include/smpi_file.hpp
+++ b/src/smpi/include/smpi_file.hpp
@@ -21,13 +21,17 @@ class File{
   int flags_;\r
   simgrid::s4u::File* file_;\r
   MPI_Info info_;\r
   int flags_;\r
   simgrid::s4u::File* file_;\r
   MPI_Info info_;\r

+  MPI_Offset shared_file_pointer_;\r

   public:\r
   File(MPI_Comm comm, char *filename, int amode, MPI_Info info);\r
   ~File();\r
   int size();\r
   public:\r
   File(MPI_Comm comm, char *filename, int amode, MPI_Info info);\r
   ~File();\r
   int size();\r

+  int get_position(MPI_Offset* offset);\r

   int flags();\r
   int sync();\r
   int seek(MPI_Offset offset, int whence);\r
   int flags();\r
   int sync();\r
   int seek(MPI_Offset offset, int whence);\r

+  MPI_Info info();\r
+  void set_info( MPI_Info info);\r

   static int read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status);\r
   static int write(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status);\r
   template <int (*T)(MPI_File, void *, int, MPI_Datatype, MPI_Status *)> int op_all(void *buf, int count,MPI_Datatype datatype, MPI_Status *status);\r
   static int read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status);\r
   static int write(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_Status *status);\r
   template <int (*T)(MPI_File, void *, int, MPI_Datatype, MPI_Status *)> int op_all(void *buf, int count,MPI_Datatype datatype, MPI_Status *status);\r

diff --git a/src/smpi/mpi/smpi_file.cpp b/src/smpi/mpi/smpi_file.cpp
index a7cfe39..6006b4d 100644 (file)
--- a/src/smpi/mpi/smpi_file.cpp
+++ b/src/smpi/mpi/smpi_file.cpp
@@ -40,6 +40,11 @@ namespace smpi{
     return MPI_SUCCESS;\r
   }\r
 \r
     return MPI_SUCCESS;\r
   }\r
 \r

+  int File::get_position(MPI_Offset* offset){\r
+    *offset=file_->tell();\r
+    return MPI_SUCCESS;\r
+  }\r
+\r

   int File::seek(MPI_Offset offset, int whence){\r
     switch(whence){\r
       case(MPI_SEEK_SET):\r
   int File::seek(MPI_Offset offset, int whence){\r
     switch(whence){\r
       case(MPI_SEEK_SET):\r


@@ -103,5 +108,18 @@ namespace smpi{
     //no idea\r
     return simgrid::smpi::Colls::barrier(comm_);\r
   }\r
     //no idea\r
     return simgrid::smpi::Colls::barrier(comm_);\r
   }\r

+MPI_Info File::info(){\r
+  if(info_== MPI_INFO_NULL)\r
+    info_ = new Info();\r
+  info_->ref();\r
+  return info_;\r
+}\r
+\r
+void File::set_info(MPI_Info info){\r
+  if(info_!= MPI_INFO_NULL)\r
+    info->ref();\r
+  info_=info;\r
+}\r
+\r

 }\r
 }\r
 }\r
 }\r