Cleanup.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7363 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/smpi/allreduce.c b/examples/smpi/allreduce.c
index eddb725..83e6b10 100644 (file)
--- a/examples/smpi/allreduce.c
+++ b/examples/smpi/allreduce.c
@@ -29,7 +29,7 @@ static int ibm_test(int rank, int size)
          int success = 1;
 #define MAXLEN  10000
 
-         int root, i, j, k;
+         int root = 0, i, j, k;
          int out[MAXLEN];
          int in[MAXLEN];
 

diff --git a/examples/smpi/alltoall2.c b/examples/smpi/alltoall2.c
index 0b1c918..a46f765 100644 (file)
--- a/examples/smpi/alltoall2.c
+++ b/examples/smpi/alltoall2.c
@@ -79,4 +79,5 @@ int main( int argc, char *argv[] )
    MPI_Barrier(MPI_COMM_WORLD);
    if(myself==0)  printf("TEST COMPLETE\n");
    MPI_Finalize();
+   return EXIT_SUCCESS;
 }

diff --git a/examples/smpi/alltoall_basic.c b/examples/smpi/alltoall_basic.c
index 12bc44d..2cb6f7d 100644 (file)
--- a/examples/smpi/alltoall_basic.c
+++ b/examples/smpi/alltoall_basic.c
@@ -15,7 +15,7 @@ int main( int argc, char *argv[] )
     int i;
     int *sb;
     int *rb;
-    int status, gstatus;
+    int status;
 
     MPI_Init(&argc,&argv);
     MPI_Comm_rank(MPI_COMM_WORLD,&rank);
@@ -45,8 +45,8 @@ int main( int argc, char *argv[] )
 
 
     if (rank == 0) {
-        if (gstatus != 0) {
-            printf("all_to_all returned %d\n",gstatus);fflush(stdout);
+        if (status != 0) {
+            printf("all_to_all returned %d\n",status);fflush(stdout);
         }
     }
     free(sb);

diff --git a/examples/smpi/alltoallv.c b/examples/smpi/alltoallv.c
index 73b6d24..5c3857c 100644 (file)
--- a/examples/smpi/alltoallv.c
+++ b/examples/smpi/alltoallv.c
@@ -50,7 +50,7 @@
 */
 
 
-void print_buffer_int(void *buf, int len, char *msg, int rank)
+static void print_buffer_int(void *buf, int len, char *msg, int rank)
 {
   int tmp, *v;
   printf("**<%d> %s (#%d): ", rank, msg,len);

diff --git a/examples/smpi/bcbench.c b/examples/smpi/bcbench.c
index 214f88b..b3b6a7b 100644 (file)
--- a/examples/smpi/bcbench.c
+++ b/examples/smpi/bcbench.c
@@ -15,10 +15,10 @@ int main(int argc, char *argv[])
 {
 
   int size, rank;
-  int N, I;
+  int N;
   struct timeval *start_time, *stop_time;
   double seconds;
-  int i, j, k;
+  int i, j;
   char *buffer;
   int check;
 

diff --git a/examples/smpi/mvmul.c b/examples/smpi/mvmul.c
index 8706b84..dbaceb8 100644 (file)
--- a/examples/smpi/mvmul.c
+++ b/examples/smpi/mvmul.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <mpi.h>
 
 #define ITERATIONS         10

diff --git a/examples/smpi/pingpong.c b/examples/smpi/pingpong.c
index 092423b..636c985 100644 (file)
--- a/examples/smpi/pingpong.c
+++ b/examples/smpi/pingpong.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <mpi.h>
 
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
          const int tag1 = 42, tag2= 43;           /* Message tag */
          int rank; 

diff --git a/examples/smpi/reduce.c b/examples/smpi/reduce.c
index 25ae108..85bfa1e 100644 (file)
--- a/examples/smpi/reduce.c
+++ b/examples/smpi/reduce.c
@@ -24,7 +24,7 @@
  * ENHANCEMENTS, OR MODIFICATIONS.
  * ***************************************************************************
  **/
-int ibm_test(int rank, int size)
+static int ibm_test(int rank, int size)
 {
   int success = 1;
 #define MAXLEN  10000

diff --git a/examples/smpi/ring_c.c b/examples/smpi/ring_c.c
index 773d74e..1d91408 100644 (file)
--- a/examples/smpi/ring_c.c
+++ b/examples/smpi/ring_c.c
@@ -8,7 +8,8 @@
  */
 
 #include <stdio.h>
-#include "mpi.h"
+#include <unistd.h>
+#include <mpi.h>
 
 int main(int argc, char *argv[])
 {

diff --git a/examples/smpi/scatter.c b/examples/smpi/scatter.c
index 2f68c91..8833cea 100644 (file)
--- a/examples/smpi/scatter.c
+++ b/examples/smpi/scatter.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <mpi.h>
 
-int ibm_test(int rank, int size)  {
+static int ibm_test(int rank, int size)  {
 
 #define MAXLEN  10000
 
@@ -62,7 +62,7 @@ int ibm_test(int rank, int size)  {
 /**
  * small test: the root sends a single distinct double to other processes
  **/
-int small_test( int rank, int size ) {
+static int small_test( int rank, int size ) {
         int success=1;
         int retval;
         int sendcount=1; // one double to each process

diff --git a/examples/smpi/second.c b/examples/smpi/second.c
index 2c80d60..e34a212 100644 (file)
--- a/examples/smpi/second.c
+++ b/examples/smpi/second.c
@@ -12,9 +12,10 @@
 /* your hostfile, do 'mpirun -machinefile hostfile -np 4 first    */
 
 #include <stdio.h>
+#include <unistd.h>
 #include <mpi.h>
 
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
   const int tag = 42;           /* Message tag */
   int id, ntasks, source_id, dest_id, err, i;

diff --git a/examples/smpi/sendrecv.c b/examples/smpi/sendrecv.c
index da30874..3f3aeee 100644 (file)
--- a/examples/smpi/sendrecv.c
+++ b/examples/smpi/sendrecv.c
@@ -1,7 +1,7 @@
 #include "mpi.h"
 #include <stdio.h>
 
-int test(int myid, int numprocs) {
+static int test(int myid, int numprocs) {
 // The tags should match on the sender and receiver side.
 // The distinction between sendtag and recvtag is mainly
 // useful to make some other Recv or Send calls match the sendrecv. 
@@ -13,7 +13,6 @@ int test(int myid, int numprocs) {
     int left, right;
     int buffer[BUFLEN], buffer2[BUFLEN];
     int i;
-    MPI_Request request;
     MPI_Status status;
 
     for (i=0;i<BUFLEN;i++) {

diff --git a/examples/smpi/split.c b/examples/smpi/split.c
index a87a4e1..bf4d3df 100644 (file)
--- a/examples/smpi/split.c
+++ b/examples/smpi/split.c
@@ -3,8 +3,9 @@
 
 int main(int argc, char *argv[])
 {
-  int worldrank, localrank;
-  MPI_Comm localcomm;
+  int worldrank;
+//  int localrank;
+//  MPI_Comm localcomm;
   MPI_Init(&argc, &argv);
   MPI_Comm_rank(MPI_COMM_WORLD, &worldrank);
   printf("MPI_Comm_split is not implemented\n");