Removing the gather_array based on the flag UNIFORM FVIEW for read all operations (dynamic/static),

+ Disabling Timing data extraction by default in dynamic write all

This commit was SVN r28592.

ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all.c

@@ -250,40 +250,22 @@
        }
      }
 
-     if (fh->f_flags & OMPIO_UNIFORM_FVIEW) {
-
-       ret = ompi_io_ompio_allgather_array (local_iov_array,
+     ret =  ompi_io_ompio_allgatherv_array (local_iov_array,
 					    local_count,
 					    fh->f_iov_type,
 					    global_iov_array,
-					    local_count,
+					    fview_count,
+					    displs,
 					    fh->f_iov_type,
 					    fh->f_aggregator_index,
 					    fh->f_procs_in_group,
 					    fh->f_procs_per_group,
 					    fh->f_comm);
-
-       if (OMPI_SUCCESS != ret){
-	 goto exit;
-       }
-     }
-     else { 
-       ret =  ompi_io_ompio_allgatherv_array (local_iov_array,
-					      local_count,
-					      fh->f_iov_type,
-					      global_iov_array,
-					      fview_count,
-					      displs,
-					      fh->f_iov_type,
-					      fh->f_aggregator_index,
-					      fh->f_procs_in_group,
-					      fh->f_procs_per_group,
-					      fh->f_comm);
-
-       if (OMPI_SUCCESS != ret){
-	 goto exit;
-       }
+     
+     if (OMPI_SUCCESS != ret){
+       goto exit;
      }
+ 
      /* sort it */
      if (0 != total_fview_count) {
 	 sorted = (int *)malloc (total_fview_count * sizeof(int));

ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all.c

@@ -31,7 +31,7 @@
 
 
 #define DEBUG_ON 0
-#define TIME_BREAKDOWN 1
+#define TIME_BREAKDOWN 0
 
 /*Used for loading file-offsets per aggregator*/
 typedef struct local_io_array{

ompi/mca/fcoll/static/fcoll_static_file_read_all.c

@@ -298,31 +298,22 @@ mca_fcoll_static_file_read_all (mca_io_ompio_file_t *fh,
       return OMPI_ERR_OUT_OF_RESOURCE;
     }
   }
-
-  if (fh->f_flags & OMPIO_UNIFORM_FVIEW) {
-    ompi_io_ompio_gather_array (local_iov_array,
-				iov_size,
-				io_array_type,
-				global_iov_array,
-				iov_size,
-				io_array_type,
-				fh->f_aggregator_index,
-				fh->f_procs_in_group,
-				fh->f_procs_per_group,
-				fh->f_comm);
-  }
-  else {
-    ompi_io_ompio_gatherv_array (local_iov_array,
-				 iov_size,
-				 io_array_type,
-				 global_iov_array,
-				 iovec_count_per_process,
-				 displs,
-				 io_array_type,
-				 fh->f_aggregator_index,
-				 fh->f_procs_in_group,
-				 fh->f_procs_per_group,
-				 fh->f_comm);
+  
+  ret = ompi_io_ompio_gatherv_array (local_iov_array,
+				     iov_size,
+				     io_array_type,
+				     global_iov_array,
+				     iovec_count_per_process,
+				     displs,
+				     io_array_type,
+				     fh->f_aggregator_index,
+				     fh->f_procs_in_group,
+				     fh->f_procs_per_group,
+				     fh->f_comm);
+  
+  if (OMPI_SUCCESS != ret){
+    fprintf(stderr,"global_iov_array gather error!\n");
+    goto exit;
   }