cleanups debug messages for read_all write_all

[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 dccfea5..d5717ee 100644 (file)
--- a/src/smpi/mpi/smpi_file.cpp
+++ b/src/smpi/mpi/smpi_file.cpp
@@ -9,11 +9,13 @@
 #include "smpi_datatype.hpp"\r
 #include "smpi_info.hpp"\r
 #include "smpi_win.hpp"\r
 #include "smpi_datatype.hpp"\r
 #include "smpi_info.hpp"\r
 #include "smpi_win.hpp"\r

+//setup here, because we have templates in smpi_file we want to log\r
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_io, smpi, "Logging specific to SMPI (RMA operations)");\r
+\r

 #include "smpi_file.hpp"\r
 #include "smpi_status.hpp"\r
 #include "simgrid/plugins/file_system.h"\r
 \r
 #include "smpi_file.hpp"\r
 #include "smpi_status.hpp"\r
 #include "simgrid/plugins/file_system.h"\r
 \r

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_io, smpi, "Logging specific to SMPI (RMA operations)");\r

 #define FP_SIZE sizeof(MPI_Offset)\r
 \r
 \r
 #define FP_SIZE sizeof(MPI_Offset)\r
 \r
 \r


@@ -68,15 +70,15 @@ namespace smpi{
   int File::seek(MPI_Offset offset, int whence){\r
     switch(whence){\r
       case(MPI_SEEK_SET):\r
   int File::seek(MPI_Offset offset, int whence){\r
     switch(whence){\r
       case(MPI_SEEK_SET):\r

-        XBT_DEBUG("Seeking in MPI_File %s, setting offset %lld", file_->get_path(), offset);\r
+        XBT_VERB("Seeking in MPI_File %s, setting offset %lld", file_->get_path(), offset);\r

         file_->seek(offset,SEEK_SET);\r
         break;\r
       case(MPI_SEEK_CUR):\r
         file_->seek(offset,SEEK_SET);\r
         break;\r
       case(MPI_SEEK_CUR):\r

-        XBT_DEBUG("Seeking in MPI_File %s, current offset + %lld", file_->get_path(), offset);\r
+        XBT_VERB("Seeking in MPI_File %s, current offset + %lld", file_->get_path(), offset);\r

         file_->seek(offset,SEEK_CUR);\r
         break;\r
       case(MPI_SEEK_END):\r
         file_->seek(offset,SEEK_CUR);\r
         break;\r
       case(MPI_SEEK_END):\r

-        XBT_DEBUG("Seeking in MPI_File %s, end offset + %lld", file_->get_path(), offset);\r
+        XBT_VERB("Seeking in MPI_File %s, end offset + %lld", file_->get_path(), offset);\r

         file_->seek(offset,SEEK_END);\r
         break;\r
       default:\r
         file_->seek(offset,SEEK_END);\r
         break;\r
       default:\r


@@ -156,7 +158,7 @@ namespace smpi{
     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
     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_VERB("Write in MPI_File %s, %lld bytes read, readsize %lld bytes, movesize %lld", fh->file_->get_path(), write, writesize, movesize);\r
+    XBT_VERB("Write in MPI_File %s, %lld bytes written, 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
     if(writesize!=movesize){\r
       fh->file_->seek(position+movesize, SEEK_SET);\r
     }\r