Changeset 704

Timestamp:

10/30/09 10:47:58 (3 weeks ago)

Author:

robl

Message:

clean up warnings

Location:

trunk

Files:

• src/lib/header.c (modified) (1 diff)
• src/lib/mpinetcdf.c (modified) (2 diffs)
• src/libf/waitallf.c (modified) (1 diff)
• test/mcoll_perf/mcoll_perf.c (modified) (3 diffs)
• test/mcoll_perf/single_mcoll_perf_non_record.c (modified) (3 diffs)
• test/mcoll_perf/single_mcoll_perf_record.c (modified) (3 diffs)

trunk/src/lib/header.c

@@ -1120 +1120 @@
   NCtype type = NC_UNSPECIFIED;
   NC_var **vpp, **end;
-  int i;
 
   assert(gbp != NULL && gbp->pos != NULL);

trunk/src/lib/mpinetcdf.c

@@ -23 +23 @@
 const char *
 ncmpi_inq_libvers(void) {
-  return "version = 1.1.0 of 26 October 2009";
+  return "version = 1.1.0 of 28 October 2009";
 }
 
@@ -13267 +13267 @@
 static int
 ncmpi_coll_wait(NCMPI_Request request) {
-  if (request->rw_flag == 1)
-  return (ncmpi_put_vara_all(request->ncid, request->varid,
+  int ret;
+  if (request->rw_flag == 1) {
+    ret = ncmpi_put_vara_all(request->ncid, request->varid,
+                   request->start, request->count,
+                   request->buf, request->bufcount,
+                   request->vartype);
+  } else if ( request->rw_flag == 0) {
+    ret = (ncmpi_get_vara_all(request->ncid, request->varid,
                    request->start, request->count,
                    request->buf, request->bufcount,
                    request->vartype));
-  if (request->rw_flag == 0)
-  return (ncmpi_get_vara_all(request->ncid, request->varid,
-                   request->start, request->count,
-                   request->buf, request->bufcount,
-                   request->vartype));
-
+  } else {
+          ret = NC_EFILE;
+  }
+  return ret;
 }
 

trunk/src/libf/waitallf.c

@@ -28 +28 @@
     int ierr;
     NCMPI_Request *l2_req;
-    int i,j;
+    int i;
     lnc_req *tmp_req = NULL;
     l2_req = malloc((*v1)*sizeof(NCMPI_Request));

trunk/test/mcoll_perf/mcoll_perf.c

@@ -29 +29 @@
 int main(int argc, char **argv)
 {
-    MPI_Datatype newtype;
     int i, j, array_of_gsizes[3],array_of_distribs[3];
     int order, nprocs, len, **buf, mynod;
     MPI_Offset bufcount;
     int array_of_dargs[3], array_of_psizes[3];
-    MPI_File fh;
     int status;
-    MPI_Offset starts[3], sizes[3], array_of_starts[3];
-    double stim, write_time, *new_write_tim, write_bw;
-    MPI_Offset file_size;
+    MPI_Offset sizes[3], array_of_starts[3];
+    double write_time, *new_write_tim;
     double start_time, open_time, def_time, run_time;
     double *new_open_tim, *new_def_tim, *new_run_tim;
-    double read_tim, new_read_tim, read_bw;
     char *pathname, filename[50];
     char dimname[20], varname[20];
@@ -54 +50 @@
     int length;
     int mvar_flag = 0;
-    NCMPI_Request request;
     NCMPI_Request *array_of_requests;
     int unlimit_flag;
@@ -329 +324 @@
       }
 
-      fprintf(stderr, "mvar nvars:%d, Global array size %d x %d x %d integers, local array size: %d x %d x%d, filesize:%d\n", nvars, array_of_gsizes[0], array_of_gsizes[1], array_of_gsizes[2],sizes[0], sizes[1], sizes[2], file_size);
+      fprintf(stderr, "mvar nvars:%d, Global array size %d x %d x %d integers, local array size: %d x %d x%d\n", nvars, array_of_gsizes[0], array_of_gsizes[1], array_of_gsizes[2],sizes[0], sizes[1], sizes[2]);
       fprintf(stderr, "%dx%dx%d, %d: nvars:%d, loop:%d, k:%d, open_t = %f, def_t =%f, write_t = %f sec,run_t = %f sec\n", sizes[0], sizes[1], sizes[2],mvar_flag, nvars, k_loop, top, new_open_tim[top], new_def_tim[top], new_write_tim[top], new_run_tim[top]); 
     }

trunk/test/mcoll_perf/single_mcoll_perf_non_record.c

@@ -29 +29 @@
 int main(int argc, char **argv)
 {
-    MPI_Datatype newtype;
     int i, j, array_of_gsizes[3],array_of_distribs[3];
     int order, nprocs, len, **buf, mynod;
     MPI_Offset bufcount;
     int array_of_dargs[3], array_of_psizes[3];
-    MPI_File fh;
     int status;
-    MPI_Offset starts[3], sizes[3], array_of_starts[3];
-    double stim, write_time, *new_write_tim, write_bw;
-    MPI_Offset file_size;
+    MPI_Offset sizes[3], array_of_starts[3];
+    double write_time, *new_write_tim;
     double start_time, open_time, def_time, run_time;
     double *new_open_tim, *new_def_tim, *new_run_tim;
-    double read_tim, new_read_tim, read_bw;
     char *pathname, filename[50];
     char dimname[20], varname[20];
@@ -54 +50 @@
     int length;
     int mvar_flag = 0;
-    NCMPI_Request request;
     NCMPI_Request *array_of_requests;
 
@@ -322 +317 @@
       }
 
-      fprintf(stderr, "one non-record variable ntimes:%d, Global array size (%d x %d) x %d x %d integers, local array size: %d x %d x %d, filesize:%d\n", ntimes, array_of_gsizes[0], ntimes, array_of_gsizes[1], array_of_gsizes[2],sizes[0], sizes[1], sizes[2], file_size);
+      fprintf(stderr, "one non-record variable ntimes:%d, Global array size (%d x %d) x %d x %d integers, local array size: %d x %d x %d\n", ntimes, array_of_gsizes[0], ntimes, array_of_gsizes[1], array_of_gsizes[2],sizes[0], sizes[1], sizes[2]);
       fprintf(stderr, "%dx%dx%d, %d: ntimes:%d, loop:%d, k:%d, open_t = %f, def_t =%f, write_t = %f sec,run_t = %f sec\n", sizes[0], sizes[1], sizes[2],mvar_flag, ntimes, k_loop, top, new_open_tim[top], new_def_tim[top], new_write_tim[top], new_run_tim[top]); 
     }

trunk/test/mcoll_perf/single_mcoll_perf_record.c

@@ -29 +29 @@
 int main(int argc, char **argv)
 {
-    MPI_Datatype newtype;
     int i, j, array_of_gsizes[3],array_of_distribs[3];
     int order, nprocs, len, **buf, mynod;
     MPI_Offset bufcount;
     int array_of_dargs[3], array_of_psizes[3];
-    MPI_File fh;
     int status;
-    MPI_Offset starts[3], sizes[3], array_of_starts[3];
-    double stim, write_time, *new_write_tim, write_bw;
-    MPI_Offset file_size;
+    MPI_Offset  sizes[3], array_of_starts[3];
+    double write_time, *new_write_tim;
     double start_time, open_time, def_time, run_time;
     double *new_open_tim, *new_def_tim, *new_run_tim;
-    double read_tim, new_read_tim, read_bw;
     char *pathname, filename[50];
     char dimname[20], varname[20];
@@ -54 +50 @@
     int length;
     int mvar_flag = 0;
-    NCMPI_Request request;
     NCMPI_Request *array_of_requests;
 
@@ -321 +316 @@
       }
 
-      fprintf(stderr, "one record variable ntimes:%d, Global array size (%d x %d) x %d x %d integers, local array size: %d x %d x%d, filesize:%d\n", ntimes, array_of_gsizes[0], ntimes, array_of_gsizes[1], array_of_gsizes[2],sizes[0], sizes[1], sizes[2], file_size);
+      fprintf(stderr, "one record variable ntimes:%d, Global array size (%d x %d) x %d x %d integers, local array size: %d x %d x%d\n", ntimes, array_of_gsizes[0], ntimes, array_of_gsizes[1], array_of_gsizes[2],sizes[0], sizes[1], sizes[2]);
       fprintf(stderr, "%dx%dx%d, %d: ntimes:%d, loop:%d, k:%d, open_t = %f, def_t =%f, write_t = %f sec,run_t = %f sec\n", sizes[0], sizes[1], sizes[2],mvar_flag, ntimes, k_loop, top, new_open_tim[top], new_def_tim[top], new_write_tim[top], new_run_tim[top]); 
     }