namespace simgrid{
namespace smpi{
- File::File(MPI_Comm comm, char *filename, int amode, MPI_Info info): comm_(comm), flags_(amode), info_(info) {
+ File::File(MPI_Comm comm, const char *filename, int amode, MPI_Info info): comm_(comm), flags_(amode), info_(info) {
file_= new simgrid::s4u::File(filename, nullptr);
list_=nullptr;
if (comm_->rank() == 0) {
return MPI_SUCCESS;
}
- int File::del(char *filename, MPI_Info info){
+ int File::del(const 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 MPI_SUCCESS;
}
- int File::write_shared(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status){
+ int File::write_shared(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, MPI_Status *status){
fh->shared_mutex_->lock();
fh->seek(*(fh->shared_file_pointer_),MPI_SEEK_SET);
- write(fh, buf, count, datatype, status);
+ write(fh, const_cast<void*>(buf), count, datatype, status);
*(fh->shared_file_pointer_)=fh->file_->tell();
fh->shared_mutex_->unlock();
return MPI_SUCCESS;
}
- int File::write_ordered(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status){
+ int File::write_ordered(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, MPI_Status *status){
//0 needs to get the shared pointer value
MPI_Offset val;
if(fh->comm_->rank()==0){
MPI_Offset result;
simgrid::smpi::Colls::scan(&val, &result, 1, MPI_OFFSET, MPI_SUM, fh->comm_);
fh->seek(result, MPI_SEEK_SET);
- int ret = fh->op_all<simgrid::smpi::File::write>(buf, count, datatype, status);
+ int ret = fh->op_all<simgrid::smpi::File::write>(const_cast<void*>(buf), count, datatype, status);
if(fh->comm_->rank()==fh->comm_->size()-1){
fh->shared_mutex_->lock();
*(fh->shared_file_pointer_)=fh->file_->tell();