Use what was previously added, and fix broken tests

[simgrid.git] / src / smpi / mpi / smpi_file.cpp

diff --git a/src/smpi/mpi/smpi_file.cpp b/src/smpi/mpi/smpi_file.cpp
index 25f2e52..79d8bcb 100644 (file)
--- a/src/smpi/mpi/smpi_file.cpp
+++ b/src/smpi/mpi/smpi_file.cpp
@@ -29,7 +29,7 @@ namespace smpi{
       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_);
@@ -43,6 +43,11 @@ namespace smpi{
   }
 
   File::~File(){
+    if(comm_->rank() == 0){
+      delete shared_file_pointer_;
+      delete[] list_;
+    }
+    delete win_;
     delete file_;
   }
 
@@ -166,7 +171,7 @@ namespace smpi{
     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);
@@ -220,18 +225,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_;
+  }
 }
 }