From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Wed, 31 Oct 2012 15:51:35 +0000 (+0100)
Subject: replace explicit smpi_sleep calls I introduced in some examples by sleep ones
X-Git-Tag: v3_9_rc1~91^2~132^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bd061d70cc07483926b798679ec9ffee591bf56c?hp=2ecf418098cd2c0f6f099b53fd3a66d23d0d06b2

replace explicit smpi_sleep calls I introduced in some examples by sleep ones
---

diff --git a/teshsuite/smpi/mpich-test/env/runtests b/teshsuite/smpi/mpich-test/env/runtests
index d4c6d154ea..3ee7e0104b 100755
--- a/teshsuite/smpi/mpich-test/env/runtests
+++ b/teshsuite/smpi/mpich-test/env/runtests
@@ -79,7 +79,7 @@ fi
 #
 testfiles=""
 if [ $runtests = 1 ] ; then
-#replaced sleep by smpi_sleep to avoid problems with real/simulation powers
+
 #RunTest timers 1 "*** Timer tests ***"
 
 RunTest init 2 "*** MPI_Initialized tests ***"
diff --git a/teshsuite/smpi/mpich-test/env/timertest.c b/teshsuite/smpi/mpich-test/env/timertest.c
index a77d29005b..04f49fcf66 100644
--- a/teshsuite/smpi/mpich-test/env/timertest.c
+++ b/teshsuite/smpi/mpich-test/env/timertest.c
@@ -22,7 +22,7 @@ int main( int argc, char **argv )
     for (i = 0; i < 5; i++)
     {
 	t1 = MPI_Wtime();
-	smpi_sleep(1);
+	sleep(1);
 	t2 = MPI_Wtime();
 	fprintf( stdout, "%f seconds\n", t2 - t1 );
     } 
diff --git a/teshsuite/smpi/mpich-test/pt2pt/order.c b/teshsuite/smpi/mpich-test/pt2pt/order.c
index 2701dd3ead..1b8f3a9f34 100644
--- a/teshsuite/smpi/mpich-test/pt2pt/order.c
+++ b/teshsuite/smpi/mpich-test/pt2pt/order.c
@@ -57,7 +57,7 @@ for this test.\n" );
     else
     {
 	MPI_Wtime();
-	smpi_sleep(easy);
+	sleep(easy);
   //while (MPI_Wtime() - t1 < easy) ;
 	a = 1;
 	b = 2;
diff --git a/teshsuite/smpi/mpich-test/pt2pt/runtests b/teshsuite/smpi/mpich-test/pt2pt/runtests
index e275fcc1d9..2661ae232b 100755
--- a/teshsuite/smpi/mpich-test/pt2pt/runtests
+++ b/teshsuite/smpi/mpich-test/pt2pt/runtests
@@ -259,7 +259,6 @@ RunTest nblock 4 "*** Testing Isend/Irecv (large numbers) ***"
 
 RunTest sendmany 8 "*** Testing Send (many procs) ***"
 
-# ... replaced by smpi_sleep calls
 RunTest order 2 "*** Testing Recv ordering ***"
 
 RunTest sendorder 2 "**** Checking Message Ordering ****"
diff --git a/teshsuite/smpi/mpich-test/pt2pt/sendorder.c b/teshsuite/smpi/mpich-test/pt2pt/sendorder.c
index b95c16e8cb..e6e3f08ec5 100644
--- a/teshsuite/smpi/mpich-test/pt2pt/sendorder.c
+++ b/teshsuite/smpi/mpich-test/pt2pt/sendorder.c
@@ -24,7 +24,7 @@ void delay( int ms )
   double  deltat = ms * 0.001;
   MPI_Wtime();
   //while (MPI_Wtime() - t < deltat) ;
-  smpi_sleep(deltat);
+  sleep(deltat);
 }
 
 void CheckStatus( MPI_Status *status, int tag, int src, int cnt, int *err )
diff --git a/teshsuite/smpi/mpich-test/pt2pt/waitall2.c b/teshsuite/smpi/mpich-test/pt2pt/waitall2.c
index 4811e56dfd..fbcee83aa6 100644
--- a/teshsuite/smpi/mpich-test/pt2pt/waitall2.c
+++ b/teshsuite/smpi/mpich-test/pt2pt/waitall2.c
@@ -18,7 +18,7 @@ void Pause( double );
 void Pause( double sec )
 {
   /*double t1 =*/ MPI_Wtime();
-  smpi_sleep(sec);
+  sleep(sec);
 //while (MPI_Wtime() - t1 < sec) ;
 }
 
diff --git a/teshsuite/smpi/mpich-test/pt2pt/waitall3.c b/teshsuite/smpi/mpich-test/pt2pt/waitall3.c
index 0b76a88b95..cdd13f8d01 100644
--- a/teshsuite/smpi/mpich-test/pt2pt/waitall3.c
+++ b/teshsuite/smpi/mpich-test/pt2pt/waitall3.c
@@ -20,7 +20,7 @@ void Pause( double );
 void Pause( double sec )
 {
   /*double t1 =*/ MPI_Wtime();
-smpi_sleep(sec);
+  sleep(sec);
 //  while (MPI_Wtime() - t1 < sec) ;
 }
 
diff --git a/teshsuite/smpi/mpich-test/pt2pt/waitall4.c b/teshsuite/smpi/mpich-test/pt2pt/waitall4.c
index bb4dc1d05a..24d9ea4071 100644
--- a/teshsuite/smpi/mpich-test/pt2pt/waitall4.c
+++ b/teshsuite/smpi/mpich-test/pt2pt/waitall4.c
@@ -21,7 +21,7 @@ void Pause( double );
 void Pause( double sec )
 {
   /*double t1 =*/ MPI_Wtime();
-  smpi_sleep(sec);
+  sleep(sec);
 //  while (MPI_Wtime() - t1 < sec) ;
 }