fix io-shared (remove spurious ordered_read) and do write then read.

[simgrid.git] / teshsuite / smpi / io-shared / io-shared.c

diff --git a/teshsuite/smpi/io-shared/io-shared.c b/teshsuite/smpi/io-shared/io-shared.c
index b18e5a6..e4b90d2 100644 (file)
--- a/teshsuite/smpi/io-shared/io-shared.c
+++ b/teshsuite/smpi/io-shared/io-shared.c
@@ -11,7 +11,6 @@ int main( int argc, char *argv[] )
     int errs = 0;
     int size;
     int rank;
-    int i;
     int* buf;
     int count;
     MPI_File fh;
@@ -21,29 +20,35 @@ int main( int argc, char *argv[] )
     MPI_Init( &argc, &argv );
  
     comm = MPI_COMM_WORLD;
-    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 );
+    MPI_File_open( comm, (char*)"/scratch/testfile", MPI_MODE_RDWR | MPI_MODE_CREATE | MPI_MODE_DELETE_ON_CLOSE, MPI_INFO_NULL, &fh );
     MPI_Comm_size( comm, &size );
     MPI_Comm_rank( comm, &rank );
-    buf = (int *)malloc( 10+size * sizeof(int) );
+    buf = (int *)malloc( sizeof(int) );
     buf[0] = rank;
- 
+
+    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );
+    MPI_Barrier(comm);
+    
+    memset( &status, 0xff, sizeof(MPI_Status) );
+    MPI_File_write_shared( fh, buf, 1, MPI_INT, &status );
+    MPI_Get_count( &status, MPI_INT, &count );
+    if (count != 1) {
+        errs++;
+        fprintf( stderr, "Count not one (%d) on write\n", count );fflush(stderr);
+    }
+
     /* Write nothing (check status) */
     memset( &status, 0xff, sizeof(MPI_Status) );
-    MPI_File_write( fh, buf, 0, MPI_INT, &status );
+    MPI_File_write_shared( fh, buf, 0, MPI_INT, &status );
     MPI_Get_count( &status, MPI_INT, &count );
     if (count != 0) {
         errs++;
         fprintf( stderr, "Count not zero (%d) on write\n", count );fflush(stderr);
     }
-    
-    MPI_Barrier( comm );
-    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );
-    for (i=0; i<size; i++) buf[i] = -1;
-    MPI_File_read_ordered( fh, buf, 10, MPI_INT, &status );
 
-    MPI_Barrier(comm);
     MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );
-
+    MPI_Barrier(comm);
+    
     memset( &status, 0xff, sizeof(MPI_Status) );
     MPI_File_read_shared( fh, buf, 1, MPI_INT, &status );
     MPI_Get_count( &status, MPI_INT, &count );
@@ -51,20 +56,10 @@ int main( int argc, char *argv[] )
         errs++;
         fprintf( stderr, "Count not zero (%d) on read shared\n", count );fflush(stderr);
     }
-    
-    MPI_Barrier(comm);
-    MPI_File_seek_shared( fh, 0, MPI_SEEK_SET );
-
-    memset( &status, 0xff, sizeof(MPI_Status) );
-    MPI_File_write_shared( fh, buf, 1, MPI_INT, &status );
-    if (count != 1) {
-        errs++;
-        fprintf( stderr, "Count not zero (%d) on write\n", count );fflush(stderr);
-    }
 
     free( buf );
     MPI_File_close( &fh );
  
     MPI_Finalize();
     return errs;
-}
\ No newline at end of file
+}