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))
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
+ 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
+}\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
+ 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->read(buf, count, datatype, status);\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
return ret;\r
}\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
+ 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
+ return ret;\r
+ }\r
+}\r
+\r
int PMPI_File_delete(char *filename, MPI_Info info){\r
if (filename == nullptr) {\r
return MPI_ERR_FILE;\r
#include "smpi_file.hpp"\r
#include "simgrid/plugins/file_system.h"\r
\r
-\r
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_io, smpi, "Logging specific to SMPI (RMA operations)");\r
\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
+\r
+ int File::write(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 = fh->file_->tell();\r
+ MPI_Offset movesize = datatype->get_extent()*count;\r
+ MPI_Offset writesize = datatype->size()*count;\r
+ XBT_DEBUG("Position before write in MPI_File %s : %llu",fh->file_->get_path(),fh->file_->tell());\r
+ MPI_Offset write = fh->file_->write(writesize);\r
+ XBT_DEBUG("Write in MPI_File %s, %lld bytes read, readsize %lld bytes, movesize %lld", fh->file_->get_path(), write, writesize, movesize);\r
+ if(writesize!=movesize){\r
+ fh->file_->seek(position+movesize, SEEK_SET);\r
}\r
- XBT_DEBUG("Position after read in MPI_File %s : %llu",file_->get_path(), file_->tell());\r
+ XBT_DEBUG("Position after write in MPI_File %s : %llu",fh->file_->get_path(), fh->file_->tell());\r
return MPI_SUCCESS;\r
}\r
\r