X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a9302e741ebc4b518302371273060cf18793917..edcc47d7373e2f1bc9ae14bf0dcceb38af59ba2b:/src/smpi/mpi/smpi_file.cpp diff --git a/src/smpi/mpi/smpi_file.cpp b/src/smpi/mpi/smpi_file.cpp index 56b0edc02b..80526840bb 100644 --- a/src/smpi/mpi/smpi_file.cpp +++ b/src/smpi/mpi/smpi_file.cpp @@ -60,7 +60,8 @@ namespace smpi{ return MPI_SUCCESS; } - int File::del(char *filename, MPI_Info info){ + int File::del(char* filename, MPI_Info) + { //get the file with MPI_MODE_DELETE_ON_CLOSE and then close it File* f = new File(MPI_COMM_SELF,filename,MPI_MODE_DELETE_ON_CLOSE|MPI_MODE_RDWR, nullptr); close(&f); @@ -107,7 +108,8 @@ namespace smpi{ return MPI_SUCCESS; } - int File::read(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status){ + int File::read(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; @@ -165,13 +167,14 @@ namespace smpi{ return ret; } - int File::write(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status){ + 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); + MPI_Offset write = fh->file_->write(writesize, 1); XBT_VERB("Write in MPI_File %s, %lld bytes written, readsize %lld bytes, movesize %lld", fh->file_->get_path(), write, writesize, movesize); if(writesize!=movesize){ fh->file_->seek(position+movesize, SEEK_SET); @@ -225,18 +228,21 @@ namespace smpi{ return simgrid::smpi::Colls::barrier(comm_); } -MPI_Info File::info(){ - if(info_== MPI_INFO_NULL) - info_ = new Info(); - info_->ref(); - return info_; -} + MPI_Info File::info(){ + if(info_== MPI_INFO_NULL) + info_ = new Info(); + info_->ref(); + return info_; + } -void File::set_info(MPI_Info info){ - if(info_!= MPI_INFO_NULL) - info->ref(); - info_=info; -} + void File::set_info(MPI_Info info){ + if(info_!= MPI_INFO_NULL) + info->ref(); + info_=info; + } + MPI_Comm File::comm(){ + return comm_; + } } }