int size= comm_->size() + FP_SIZE;
list_ = new char[size];
memset(list_, 0, size);
- shared_file_pointer_ = new MPI_Offset[1];
+ shared_file_pointer_ = new MPI_Offset();
shared_mutex_ = s4u::Mutex::create();
*shared_file_pointer_ = 0;
win_=new Win(list_, size, 1, MPI_INFO_NULL, comm_);
}
File::~File(){
+ if(comm_->rank() == 0){
+ delete shared_file_pointer_;
+ delete[] list_;
+ }
+ delete win_;
delete file_;
}
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);
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;
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);
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_;
+ }
}
}