Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
cleanups
[simgrid.git] / src / smpi / bindings / smpi_pmpi_file.cpp
index 5844463..dc03edf 100644 (file)
  * under the terms of the license (GNU LGPL) which comes with this package. */\r
 \r
 #include "private.hpp"\r
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);\r
+\r
 #include "smpi_file.hpp"\r
 #include "smpi_datatype.hpp"\r
 \r
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);\r
 \r
 int PMPI_File_open(MPI_Comm comm, char *filename, int amode, MPI_Info info, MPI_File *fh){\r
-  if (comm == MPI_COMM_NULL) {\r
+  if (comm == MPI_COMM_NULL)\r
     return MPI_ERR_COMM;\r
-  } else if (filename == nullptr) {\r
+  if (filename == nullptr)\r
     return MPI_ERR_FILE;\r
-  } else if (amode < 0) {\r
+  if (amode < 0)\r
+    return MPI_ERR_AMODE;\r
+  smpi_bench_end();\r
+  *fh =  new simgrid::smpi::File(comm, filename, amode, info);\r
+  smpi_bench_begin();\r
+  if (((*fh)->size() == 0 && (not amode & MPI_MODE_CREATE)) ||\r
+     ((*fh)->size() != 0 && (amode & MPI_MODE_EXCL))){\r
+    delete fh;\r
     return MPI_ERR_AMODE;\r
-  } else {\r
-    smpi_bench_end();\r
-    *fh =  new simgrid::smpi::File(comm, filename, amode, info);\r
-    smpi_bench_begin();\r
-    if (((*fh)->size() == 0 && (not amode & MPI_MODE_CREATE)) ||\r
-       ((*fh)->size() != 0 && (amode & MPI_MODE_EXCL))){\r
-      delete fh;\r
-      return MPI_ERR_AMODE;\r
-    }\r
-    if(amode & MPI_MODE_APPEND)\r
-      (*fh)->seek(0,MPI_SEEK_END);\r
-    return MPI_SUCCESS;\r
   }\r
+  if(amode & MPI_MODE_APPEND)\r
+    (*fh)->seek(0,MPI_SEEK_END);\r
+  return MPI_SUCCESS;\r
 }\r
 \r
 int PMPI_File_close(MPI_File *fh){\r
-  if (fh==nullptr){\r
+  if (fh==nullptr)\r
     return MPI_ERR_ARG;\r
-  } else {\r
-    smpi_bench_end();\r
-    int ret = simgrid::smpi::File::close(fh);\r
-    *fh = MPI_FILE_NULL;\r
-    smpi_bench_begin();\r
-    return ret;\r
-  }\r
+  smpi_bench_end();\r
+  int ret = simgrid::smpi::File::close(fh);\r
+  *fh = MPI_FILE_NULL;\r
+  smpi_bench_begin();\r
+  return ret;\r
+}\r
+#define CHECK_FILE(fh) if(fh==MPI_FILE_NULL) return MPI_ERR_FILE;\r
+#define CHECK_BUFFER(buf, count)  if (buf==nullptr && count > 0) return MPI_ERR_BUFFER;\r
+#define CHECK_COUNT(count)  if (count < 0) return MPI_ERR_COUNT;\r
+#define CHECK_OFFSET(offset)  if (offset < 0) return MPI_ERR_DISP;\r
+#define CHECK_DATATYPE(datatype, count) if (datatype == MPI_DATATYPE_NULL && count > 0) return MPI_ERR_TYPE;\r
+#define CHECK_STATUS(status) if (status == nullptr) return MPI_ERR_ARG;\r
+#define CHECK_FLAGS(fh) if (fh->flags() & MPI_MODE_SEQUENTIAL) return MPI_ERR_AMODE;\r
+\r
+#define PASS_ZEROCOUNT(count) if (count == 0) {\\r
+status->count=0;\\r
+return MPI_SUCCESS;\\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
   CHECK_FILE(fh);
-  else {\r
-    smpi_bench_end();\r
-    int ret = fh->seek(offset,whence);\r
-    smpi_bench_begin();\r
-    return ret;\r
-  }\r
+  smpi_bench_end();\r
+  int ret = fh->seek(offset,whence);\r
+  smpi_bench_begin();\r
+  return ret;\r
+\r
+}\r
+\r
+int PMPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence){\r
+  CHECK_FILE(fh)\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
+  if (offset==nullptr)\r
+    return MPI_ERR_DISP;\r
+  smpi_bench_end();\r
+  int ret = fh->get_position(offset);\r
+  smpi_bench_begin();\r
+  return ret;\r
+}\r
+\r
+int PMPI_File_get_position_shared(MPI_File fh, MPI_Offset* offset){\r
+  CHECK_FILE(fh)\r
+  if (offset==nullptr)\r
+    return MPI_ERR_DISP;\r
+  smpi_bench_end();\r
+  int ret = fh->get_position_shared(offset);\r
+  smpi_bench_begin();\r
+  return ret;\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
-  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 = 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
+  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
+  PASS_ZEROCOUNT(count)\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 = 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
+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
+  CHECK_DATATYPE(datatype, count)\r
+  CHECK_STATUS(status)\r
+  CHECK_FLAGS(fh)\r
+  PASS_ZEROCOUNT(count)\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
 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
+  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
+  PASS_ZEROCOUNT(count)\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
+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
+  CHECK_DATATYPE(datatype, count)\r
+  CHECK_STATUS(status)\r
+  CHECK_FLAGS(fh)\r
+  PASS_ZEROCOUNT(count)\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
+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
+  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
+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
+  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
+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
+  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
+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
+  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
 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
+  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
   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
+  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,MPI_SEEK_SET);\r
+  if(ret!=MPI_SUCCESS)\r
     return ret;\r
-  }\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
+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
+  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,MPI_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
 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
+  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
   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
+  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,MPI_SEEK_SET);\r
+  if(ret!=MPI_SUCCESS)\r
     return ret;\r
-  }\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
+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
+  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,MPI_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
 int PMPI_File_delete(char *filename, MPI_Info info){\r
-  if (filename == nullptr) {\r
+  if (filename == nullptr)\r
     return MPI_ERR_FILE;\r
-  } else {\r
-    smpi_bench_end();\r
-    int ret = simgrid::smpi::File::del(filename, info);\r
-    smpi_bench_begin();\r
-    return ret;\r
-  }\r
+  smpi_bench_end();\r
+  int ret = simgrid::smpi::File::del(filename, info);\r
+  smpi_bench_begin();\r
+  return ret;\r
+}\r
+\r
+int PMPI_File_get_info(MPI_File  fh, MPI_Info* info)\r
+{\r
+  CHECK_FILE(fh)\r
+  *info = fh->info();\r
+  return MPI_SUCCESS;\r
 }\r
 \r
+int PMPI_File_set_info(MPI_File  fh, MPI_Info info)\r
+{\r
+  CHECK_FILE(fh)\r
+  fh->set_info(info);\r
+  return MPI_SUCCESS;\r
+}
\ No newline at end of file