Add some tests for io.

diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt
index 800ae86..8dc3a02 100644 (file)
--- a/teshsuite/smpi/CMakeLists.txt
+++ b/teshsuite/smpi/CMakeLists.txt
@@ -8,7 +8,8 @@ if(enable_smpi)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   foreach(x coll-allgather coll-allgatherv coll-allreduce coll-alltoall coll-alltoallv coll-barrier coll-bcast
             coll-gather coll-reduce coll-reduce-scatter coll-scatter macro-sample pt2pt-dsend pt2pt-pingpong
-            type-hvector type-indexed type-struct type-vector bug-17132 timers privatization )
+            type-hvector type-indexed type-struct type-vector bug-17132 timers privatization 
+            io-simple io-simple-at io-all io-shared io-ordered)
     add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.c)
     target_link_libraries(${x}  simgrid)
     set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -36,7 +37,8 @@ endif()
 foreach(x coll-allgather coll-allgatherv coll-allreduce coll-alltoall coll-alltoallv coll-barrier coll-bcast
     coll-gather coll-reduce coll-reduce-scatter coll-scatter macro-sample pt2pt-dsend pt2pt-pingpong
     type-hvector type-indexed type-struct type-vector bug-17132 timers privatization
-    macro-shared macro-partial-shared macro-partial-shared-communication)
+    macro-shared macro-partial-shared macro-partial-shared-communication
+    io-simple io-simple-at io-all io-shared io-ordered)
   set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
 endforeach()
@@ -63,7 +65,7 @@ if(enable_smpi)
 
   foreach(x coll-allgather coll-allgatherv coll-allreduce coll-alltoall coll-alltoallv coll-barrier coll-bcast
             coll-gather coll-reduce coll-reduce-scatter coll-scatter macro-sample pt2pt-dsend pt2pt-pingpong
-           type-hvector type-indexed type-struct type-vector bug-17132 timers)
+           type-hvector type-indexed type-struct type-vector bug-17132 timers io-simple io-simple-at io-all io-shared io-ordered)
     ADD_TESH_FACTORIES(tesh-smpi-${x} "thread;ucontext;raw;boost" --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/${x} ${x}.tesh)
   endforeach()
 

diff --git a/teshsuite/smpi/io-all/io-all.c b/teshsuite/smpi/io-all/io-all.c
new file mode 100644 (file)
index 0000000..56d95b3
--- /dev/null
+++ b/teshsuite/smpi/io-all/io-all.c
@@ -0,0 +1,74 @@
+#include "mpi.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include <memory.h>\r
+\r
+/* Test reading and writing zero bytes (set status correctly) */\r
+\r
+int main( int argc, char *argv[] )\r
+{\r
+    int errs = 0;\r
+    int size, rank, i, *buf, count;\r
+    MPI_File fh;\r
+    MPI_Comm comm;\r
+    MPI_Status status;\r
+ \r
+    MPI_Init( &argc, &argv );\r
+ \r
+    comm = MPI_COMM_WORLD;\r
+    MPI_File_open( comm, (char*)"/scratch/lib/libsimgrid.so.3.6.2", MPI_MODE_RDWR | MPI_MODE_CREATE | MPI_MODE_DELETE_ON_CLOSE, MPI_INFO_NULL, &fh );\r
+    MPI_Comm_size( comm, &size );\r
+    MPI_Comm_rank( comm, &rank );\r
+    buf = (int *)malloc( 10+ size * sizeof(int) );\r
+    buf[0] = rank;\r
+ \r
+    /* Write to file */\r
+    MPI_File_seek( fh, sizeof(int)*rank, MPI_SEEK_SET ); \r
+    MPI_File_write_all( fh, buf, 1, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 1) {\r
+        errs++;\r
+        fprintf( stderr, "Wrong count (%d) on write\n", count );fflush(stderr);\r
+    }\r
+    /* Write to file, overlapping */\r
+    MPI_File_seek( fh, sizeof(int)*rank, MPI_SEEK_SET ); \r
+    MPI_File_write_all( fh, buf, 10, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 10) {\r
+        errs++;\r
+        fprintf( stderr, "Wrong count (%d) on write\n", count );fflush(stderr);\r
+    }\r
+    /* Read nothing (check status) */\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_read_all( fh, buf, 0, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 0) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on read\n", count );fflush(stderr);\r
+    }\r
+\r
+    /* Write nothing (check status) */\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_write_all( fh, buf, 0, MPI_INT, &status );\r
+    if (count != 0) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on write\n", count );fflush(stderr);\r
+    }\r
+\r
+    MPI_Barrier( comm );\r
+\r
+    MPI_File_seek( fh, sizeof(int)*rank, MPI_SEEK_SET );\r
+    for (i=0; i<size; i++) buf[i] = -1;\r
+    MPI_File_read_all( fh, buf, 10, MPI_INT, &status );\r
+    // if (buf[0] != rank) {\r
+        // errs++;\r
+        // fprintf( stderr, "%d: buf = %d\n", rank, buf[0] );fflush(stderr);\r
+    // }\r
+ \r
+    free( buf );\r
+    MPI_File_close( &fh );\r
+ \r
+    MPI_Finalize();\r
+    return errs;\r
+}
\ No newline at end of file

diff --git a/teshsuite/smpi/io-all/io-all.tesh b/teshsuite/smpi/io-all/io-all.tesh
new file mode 100644 (file)
index 0000000..0a800a1
--- /dev/null
+++ b/teshsuite/smpi/io-all/io-all.tesh
@@ -0,0 +1,52 @@
+# Test for MPI_File_read and MPI_File_write\r
+! output sort\r
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/storage/remote_io.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_kernel.thres:warning --log=smpi_mpi.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" ${bindir:=.}/io-all\r
+> You requested to use 4 ranks, but there is only 2 processes in your hostfile...\r
+> [rank 0] -> bob\r
+> [rank 1] -> carl\r
+> [rank 2] -> bob\r
+> [rank 3] -> carl\r
+> [  0.000282] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000358] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.000534] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 12\r
+> [  0.000534] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.000737] (3@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000737] (3@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 16\r
+> [  0.000737] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 12\r
+> [  0.000737] (1@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000737] (1@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 8\r
+> [  0.000737] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.000838] (2@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000838] (2@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12\r
+> [  0.000838] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.000838] (0@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000838] (0@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.000838] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001040] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 39\r
+> [  0.001040] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 26\r
+> [  0.001040] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001040] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 13\r
+> [  0.001041] (3@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes written, readsize 12 bytes, movesize 12\r
+> [  0.001041] (3@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 51\r
+> [  0.001041] (1@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes written, readsize 12 bytes, movesize 12\r
+> [  0.001041] (1@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 25\r
+> [  0.001141] (0@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes written, readsize 12 bytes, movesize 12\r
+> [  0.001141] (0@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12\r
+> [  0.001141] (2@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes written, readsize 12 bytes, movesize 12\r
+> [  0.001141] (2@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 38\r
+> [  0.001799] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001814] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.001849] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 12\r
+> [  0.001849] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.002052] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.002052] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 26\r
+> [  0.002052] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 39\r
+> [  0.002052] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 13\r
+> [  0.002052] (3@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes read, readsize 12 bytes, movesize 12\r
+> [  0.002052] (3@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 51\r
+> [  0.002052] (1@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes read, readsize 12 bytes, movesize 12\r
+> [  0.002052] (1@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 25\r
+> [  0.002153] (2@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes read, readsize 12 bytes, movesize 12\r
+> [  0.002153] (2@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 38\r
+> [  0.002153] (0@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 12 bytes read, readsize 12 bytes, movesize 12\r
+> [  0.002153] (0@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12
\ No newline at end of file

diff --git a/teshsuite/smpi/io-ordered/io-ordered.c b/teshsuite/smpi/io-ordered/io-ordered.c
new file mode 100644 (file)
index 0000000..e5225df
--- /dev/null
+++ b/teshsuite/smpi/io-ordered/io-ordered.c
@@ -0,0 +1,46 @@
+#include "mpi.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include <memory.h>\r
+\r
+/* Test reading and writing zero bytes (set status correctly) */\r
+\r
+int main( int argc, char *argv[] )\r
+{\r
+    int errs = 0;\r
+    int size, rank, i, *buf, count;\r
+    MPI_File fh;\r
+    MPI_Comm comm;\r
+    MPI_Status status;\r
+ \r
+    MPI_Init( &argc, &argv );\r
+ \r
+    comm = MPI_COMM_WORLD;\r
+    MPI_File_open( comm, (char*)"/scratch/lib/libsimgrid.so.3.6.2", MPI_MODE_RDWR | MPI_MODE_CREATE | MPI_MODE_DELETE_ON_CLOSE, MPI_INFO_NULL, &fh );\r
+    MPI_Comm_size( comm, &size );\r
+    MPI_Comm_rank( comm, &rank );\r
+    buf = (int *)malloc( 10+size * sizeof(int) );\r
+    buf[0] = rank;\r
+ \r
+    /* Write to file */\r
+    MPI_File_write_ordered( fh, buf, 10, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 10) {\r
+        errs++;\r
+        fprintf( stderr, "Wrong count (%d) on write-ordered\n", count );fflush(stderr);\r
+    }\r
+    MPI_Barrier( comm );\r
+    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );\r
+    for (i=0; i<size; i++) buf[i] = -1;\r
+    MPI_File_read_ordered( fh, buf, 10, MPI_INT, &status );\r
+\r
+    MPI_Barrier(comm);\r
+    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );\r
+\r
+    free( buf );\r
+    MPI_File_close( &fh );\r
+ \r
+    MPI_Finalize();\r
+    return errs;\r
+}
\ No newline at end of file

diff --git a/teshsuite/smpi/io-ordered/io-ordered.tesh b/teshsuite/smpi/io-ordered/io-ordered.tesh
new file mode 100644 (file)
index 0000000..b57d658
--- /dev/null
+++ b/teshsuite/smpi/io-ordered/io-ordered.tesh
@@ -0,0 +1,40 @@
+# Test for MPI_File_read and MPI_File_write\r
+! output sort\r
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/storage/remote_io.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_kernel.thres:warning --log=smpi_mpi.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" ${bindir:=.}/io-ordered\r
+> You requested to use 4 ranks, but there is only 2 processes in your hostfile...\r
+> [rank 0] -> bob\r
+> [rank 1] -> carl\r
+> [rank 2] -> bob\r
+> [rank 3] -> carl\r
+> [  0.000282] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000635] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 80\r
+> [  0.000635] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 40\r
+> [  0.000635] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 120\r
+> [  0.000839] (3@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes written, readsize 40 bytes, movesize 40\r
+> [  0.000839] (3@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 160\r
+> [  0.000839] (1@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes written, readsize 40 bytes, movesize 40\r
+> [  0.000839] (1@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 80\r
+> [  0.000940] (2@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes written, readsize 40 bytes, movesize 40\r
+> [  0.000940] (2@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 120\r
+> [  0.000940] (0@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes written, readsize 40 bytes, movesize 40\r
+> [  0.000940] (0@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 40\r
+> [  0.001091] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001091] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001106] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001141] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001141] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001242] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 80\r
+> [  0.001242] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 40\r
+> [  0.001242] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 120\r
+> [  0.001446] (3@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.001446] (3@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 160\r
+> [  0.001446] (1@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.001446] (1@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 80\r
+> [  0.001548] (2@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.001548] (2@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 120\r
+> [  0.001548] (0@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.001548] (0@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 40\r
+> [  0.001699] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001714] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001749] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001749] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0
\ No newline at end of file

diff --git a/teshsuite/smpi/io-shared/io-shared.c b/teshsuite/smpi/io-shared/io-shared.c
new file mode 100644 (file)
index 0000000..d83c8ba
--- /dev/null
+++ b/teshsuite/smpi/io-shared/io-shared.c
@@ -0,0 +1,66 @@
+#include "mpi.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include <memory.h>\r
+\r
+/* Test reading and writing zero bytes (set status correctly) */\r
+\r
+int main( int argc, char *argv[] )\r
+{\r
+    int errs = 0;\r
+    int size, rank, i, *buf, count;\r
+    MPI_File fh;\r
+    MPI_Comm comm;\r
+    MPI_Status status;\r
+ \r
+    MPI_Init( &argc, &argv );\r
+ \r
+    comm = MPI_COMM_WORLD;\r
+    MPI_File_open( comm, (char*)"/scratch/lib/libsimgrid.so.3.6.2", MPI_MODE_RDWR | MPI_MODE_CREATE | MPI_MODE_DELETE_ON_CLOSE, MPI_INFO_NULL, &fh );\r
+    MPI_Comm_size( comm, &size );\r
+    MPI_Comm_rank( comm, &rank );\r
+    buf = (int *)malloc( 10+size * sizeof(int) );\r
+    buf[0] = rank;\r
+ \r
+    /* Write nothing (check status) */\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_write( fh, buf, 0, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 0) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on write\n", count );fflush(stderr);\r
+    }\r
+    \r
+    MPI_Barrier( comm );\r
+    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );\r
+    for (i=0; i<size; i++) buf[i] = -1;\r
+    MPI_File_read_ordered( fh, buf, 10, MPI_INT, &status );\r
+\r
+    MPI_Barrier(comm);\r
+    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );\r
+\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_read_shared( fh, buf, 1, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 1) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on read shared\n", count );fflush(stderr);\r
+    }\r
+    \r
+    MPI_Barrier(comm);\r
+    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );\r
+\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_write_shared( fh, buf, 1, MPI_INT, &status );\r
+    if (count != 1) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on write\n", count );fflush(stderr);\r
+    }\r
+\r
+    free( buf );\r
+    MPI_File_close( &fh );\r
+ \r
+    MPI_Finalize();\r
+    return errs;\r
+}
\ No newline at end of file

diff --git a/teshsuite/smpi/io-shared/io-shared.tesh b/teshsuite/smpi/io-shared/io-shared.tesh
new file mode 100644 (file)
index 0000000..593588f
--- /dev/null
+++ b/teshsuite/smpi/io-shared/io-shared.tesh
@@ -0,0 +1,56 @@
+# Test for MPI_File_read and MPI_File_write\r
+! output sort\r
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/storage/remote_io.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_kernel.thres:warning --log=smpi_mpi.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" ${bindir:=.}/io-shared\r
+> You requested to use 4 ranks, but there is only 2 processes in your hostfile...\r
+> [rank 0] -> bob\r
+> [rank 1] -> carl\r
+> [rank 2] -> bob\r
+> [rank 3] -> carl\r
+> [  0.000584] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000584] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000599] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000634] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000634] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000735] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 80\r
+> [  0.000735] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 40\r
+> [  0.000735] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 120\r
+> [  0.000939] (3@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.000939] (3@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 160\r
+> [  0.000939] (1@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.000939] (1@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 80\r
+> [  0.001041] (2@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.001041] (2@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 120\r
+> [  0.001041] (0@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 40 bytes read, readsize 40 bytes, movesize 40\r
+> [  0.001041] (0@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 40\r
+> [  0.001192] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001192] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001292] (0@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.001292] (0@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.001292] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001292] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001292] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001292] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001393] (2@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.001393] (2@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.001393] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.001393] (3@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.001393] (3@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 8\r
+> [  0.001393] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.001393] (1@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.001393] (1@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12\r
+> [  0.001443] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001443] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001544] (0@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.001544] (0@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.001544] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001544] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001544] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001544] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.001645] (2@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.001645] (2@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.001645] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.001645] (3@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.001645] (3@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 8\r
+> [  0.001645] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.001645] (1@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.001645] (1@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12
\ No newline at end of file

diff --git a/teshsuite/smpi/io-simple-at/io-simple-at.c b/teshsuite/smpi/io-simple-at/io-simple-at.c
new file mode 100644 (file)
index 0000000..6a6e161
--- /dev/null
+++ b/teshsuite/smpi/io-simple-at/io-simple-at.c
@@ -0,0 +1,65 @@
+#include "mpi.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include <memory.h>\r
+\r
+/* Test reading and writing zero bytes (set status correctly) */\r
+\r
+int main( int argc, char *argv[] )\r
+{\r
+    int errs = 0;\r
+    int size, rank, i, *buf, count;\r
+    MPI_File fh;\r
+    MPI_Comm comm;\r
+    MPI_Status status;\r
+ \r
+    MPI_Init( &argc, &argv );\r
+ \r
+    comm = MPI_COMM_WORLD;\r
+    MPI_File_open( comm, (char*)"/scratch/lib/libsimgrid.so.3.6.2", MPI_MODE_RDWR | MPI_MODE_CREATE | MPI_MODE_DELETE_ON_CLOSE, MPI_INFO_NULL, &fh );\r
+    MPI_Comm_size( comm, &size );\r
+    MPI_Comm_rank( comm, &rank );\r
+    buf = (int *)malloc( size * sizeof(int) );\r
+    buf[0] = rank;\r
+ \r
+    /* Write to file */\r
+    MPI_File_write_at( fh, sizeof(int)*rank, buf, 1, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 1) {\r
+        errs++;\r
+        fprintf( stderr, "Wrong count (%d) on write_at\n", count );fflush(stderr);\r
+    }\r
+\r
+    /* Read nothing (check status) */\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_read_at( fh, sizeof(int)*rank, buf, 0, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 0) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on read\n", count );fflush(stderr);\r
+    }\r
+\r
+    /* Write nothing (check status) */\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_write_at( fh, sizeof(int)*rank, buf, 0, MPI_INT, &status );\r
+    if (count != 0) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on write\n", count );fflush(stderr);\r
+    }\r
+\r
+    MPI_Barrier( comm );\r
+\r
+    for (i=0; i<size; i++) buf[i] = -1;\r
+    MPI_File_read_at( fh, sizeof(int)*rank, buf, 1, MPI_INT, &status );\r
+    // if (buf[0] != rank) {\r
+        // errs++;\r
+        // fprintf( stderr, "%d: buf = %d\n", rank, buf[0] );fflush(stderr);\r
+    // }\r
+ \r
+    free( buf );\r
+    MPI_File_close( &fh );\r
+ \r
+    MPI_Finalize();\r
+    return errs;\r
+}
\ No newline at end of file

diff --git a/teshsuite/smpi/io-simple-at/io-simple-at.tesh b/teshsuite/smpi/io-simple-at/io-simple-at.tesh
new file mode 100644 (file)
index 0000000..90b665a
--- /dev/null
+++ b/teshsuite/smpi/io-simple-at/io-simple-at.tesh
@@ -0,0 +1,32 @@
+# Test for MPI_File_read and MPI_File_write\r
+! output sort\r
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/storage/remote_io.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_kernel.thres:warning --log=smpi_mpi.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" ${bindir:=.}/io-simple-at\r
+> You requested to use 4 ranks, but there is only 2 processes in your hostfile...\r
+> [rank 0] -> bob\r
+> [rank 1] -> carl\r
+> [rank 2] -> bob\r
+> [rank 3] -> carl\r
+> [  0.000282] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000358] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.000383] (0@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000383] (0@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.000459] (2@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000459] (2@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12\r
+> [  0.000534] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 12\r
+> [  0.000534] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.000534] (3@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000534] (3@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 16\r
+> [  0.000534] (1@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000534] (1@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 8\r
+> [  0.000584] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000599] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.000634] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 12\r
+> [  0.000634] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.000634] (3@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000634] (3@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 16\r
+> [  0.000634] (1@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000634] (1@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 8\r
+> [  0.000685] (0@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000685] (0@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.000700] (2@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000700] (2@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12
\ No newline at end of file

diff --git a/teshsuite/smpi/io-simple/io-simple.c b/teshsuite/smpi/io-simple/io-simple.c
new file mode 100644 (file)
index 0000000..33d8ef0
--- /dev/null
+++ b/teshsuite/smpi/io-simple/io-simple.c
@@ -0,0 +1,67 @@
+#include "mpi.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include <memory.h>\r
+\r
+/* Test reading and writing zero bytes (set status correctly) */\r
+\r
+int main( int argc, char *argv[] )\r
+{\r
+    int errs = 0;\r
+    int size, rank, i, *buf, count;\r
+    MPI_File fh;\r
+    MPI_Comm comm;\r
+    MPI_Status status;\r
+ \r
+    MPI_Init( &argc, &argv );\r
+ \r
+    comm = MPI_COMM_WORLD;\r
+    MPI_File_open( comm, (char*)"/scratch/lib/libsimgrid.so.3.6.2", MPI_MODE_RDWR | MPI_MODE_CREATE | MPI_MODE_DELETE_ON_CLOSE, MPI_INFO_NULL, &fh );\r
+    MPI_Comm_size( comm, &size );\r
+    MPI_Comm_rank( comm, &rank );\r
+    buf = (int *)malloc( size * sizeof(int) );\r
+    buf[0] = rank;\r
+ \r
+    /* Write to file */\r
+    MPI_File_seek( fh, sizeof(int)*rank, MPI_SEEK_SET ); \r
+    MPI_File_write( fh, buf, 1, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 1) {\r
+        errs++;\r
+        fprintf( stderr, "Wrong count (%d) on write\n", count );fflush(stderr);\r
+    }\r
+\r
+    /* Read nothing (check status) */\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_read( fh, buf, 0, MPI_INT, &status );\r
+    MPI_Get_count( &status, MPI_INT, &count );\r
+    if (count != 0) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on read\n", count );fflush(stderr);\r
+    }\r
+\r
+    /* Write nothing (check status) */\r
+    memset( &status, 0xff, sizeof(MPI_Status) );\r
+    MPI_File_write( fh, buf, 0, MPI_INT, &status );\r
+    if (count != 0) {\r
+        errs++;\r
+        fprintf( stderr, "Count not zero (%d) on write\n", count );fflush(stderr);\r
+    }\r
+\r
+    MPI_Barrier( comm );\r
+\r
+    MPI_File_seek( fh, sizeof(int)*rank, MPI_SEEK_SET );\r
+    for (i=0; i<size; i++) buf[i] = -1;\r
+    MPI_File_read( fh, buf, 1, MPI_INT, &status );\r
+    // if (buf[0] != rank) {\r
+        // errs++;\r
+        // fprintf( stderr, "%d: buf = %d\n", rank, buf[0] );fflush(stderr);\r
+    // }\r
+ \r
+    free( buf );\r
+    MPI_File_close( &fh );\r
+ \r
+    MPI_Finalize();\r
+    return errs;\r
+}
\ No newline at end of file

diff --git a/teshsuite/smpi/io-simple/io-simple.tesh b/teshsuite/smpi/io-simple/io-simple.tesh
new file mode 100644 (file)
index 0000000..6621c9c
--- /dev/null
+++ b/teshsuite/smpi/io-simple/io-simple.tesh
@@ -0,0 +1,32 @@
+# Test for MPI_File_read and MPI_File_write\r
+! output sort\r
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/storage/remote_io.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_kernel.thres:warning --log=smpi_mpi.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" ${bindir:=.}/io-simple\r
+> You requested to use 4 ranks, but there is only 2 processes in your hostfile...\r
+> [rank 0] -> bob\r
+> [rank 1] -> carl\r
+> [rank 2] -> bob\r
+> [rank 3] -> carl\r
+> [  0.000282] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000358] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.000383] (0@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000383] (0@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.000459] (2@bob) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000459] (2@bob) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12\r
+> [  0.000534] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 12\r
+> [  0.000534] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.000534] (3@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000534] (3@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 16\r
+> [  0.000534] (1@carl) Write in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes written, readsize 4 bytes, movesize 4\r
+> [  0.000534] (1@carl) Position after write in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 8\r
+> [  0.000584] (0@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 0\r
+> [  0.000599] (2@bob) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 8\r
+> [  0.000634] (3@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 12\r
+> [  0.000634] (1@carl) Seeking in MPI_File /scratch/lib/libsimgrid.so.3.6.2, setting offset 4\r
+> [  0.000634] (3@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000634] (3@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 16\r
+> [  0.000634] (1@carl) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000634] (1@carl) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 8\r
+> [  0.000685] (0@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000685] (0@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 4\r
+> [  0.000700] (2@bob) Read in MPI_File /scratch/lib/libsimgrid.so.3.6.2, 4 bytes read, readsize 4 bytes, movesize 4\r
+> [  0.000700] (2@bob) Position after read in MPI_File /scratch/lib/libsimgrid.so.3.6.2 : 12
\ No newline at end of file