Revert "Performance tuning. make sure we catch if the user wants to set the default fileview and replace it with"

This reverts commit ffa67b9.

Author: edgargabriel

ompi/mca/io/ompio/io_ompio.c

@@ -100,15 +100,14 @@ static int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
 static int mca_io_ompio_merge_groups(mca_io_ompio_file_t *fh,
                                      int *merge_aggrs,
                                      int num_merge_aggrs);
- 
-#define MCA_IO_OMPIO_DEFAULT_FVIEW_SIZE 4*1024*1024
-ompi_datatype_t *mca_io_ompio_default_file_view=NULL;
+
+
 
 int ompi_io_ompio_set_file_defaults (mca_io_ompio_file_t *fh)
 {
 
    if (NULL != fh) {
-        ompi_datatype_t *types[2];
+        ompi_datatype_t *types[2], *default_file_view;
         int blocklen[2] = {1, 1};
         OPAL_PTRDIFF_TYPE d[2], base;
         int i;
@@ -134,13 +133,13 @@ int ompi_io_ompio_set_file_defaults (mca_io_ompio_file_t *fh)
         fh->f_init_num_aggrs = -1;
         fh->f_init_aggr_list = NULL;
 
-	ompi_datatype_create_contiguous(MCA_IO_OMPIO_DEFAULT_FVIEW_SIZE,
+	ompi_datatype_create_contiguous(1048576,
 					&ompi_mpi_byte.dt,
-					&mca_io_ompio_default_file_view);
-	ompi_datatype_commit (&mca_io_ompio_default_file_view);
+					&default_file_view);
+	ompi_datatype_commit (&default_file_view);
 
 	fh->f_etype = &ompi_mpi_byte.dt;
-	fh->f_filetype =  mca_io_ompio_default_file_view;
+	fh->f_filetype =  default_file_view;
 
 
         /* Default file View */
@@ -152,10 +151,9 @@ int ompi_io_ompio_set_file_defaults (mca_io_ompio_file_t *fh)
 	mca_io_ompio_set_view_internal(fh,
 				       0,
 				       &ompi_mpi_byte.dt,
-				       mca_io_ompio_default_file_view,
+				       default_file_view,
 				       "native",
 				       fh->f_info);
-        fh->f_flags |= OMPIO_FILE_VIEW_IS_SET;
 
 
 	/*Create a derived datatype for the created iovec */

ompi/mca/io/ompio/io_ompio_file_set_view.c

@@ -38,7 +38,6 @@
 #include "io_ompio.h"
 
 static OMPI_MPI_OFFSET_TYPE get_contiguous_chunk_size (mca_io_ompio_file_t *);
-extern ompi_datatype_t *mca_io_ompio_default_file_view;
 
 
 int mca_io_ompio_set_view_internal(mca_io_ompio_file_t *fh,
@@ -140,23 +139,6 @@ int mca_io_ompio_file_set_view (ompi_file_t *fp,
     data = (mca_io_ompio_data_t *) fp->f_io_selected_data;
     fh = &data->ompio_fh;
 
-    if ( fh->f_flags & OMPIO_FILE_VIEW_IS_SET ) {
-	if ( MPI_BYTE == etype && MPI_BYTE == filetype ) {
-	    /* this is the default file view that the user provides. If we also have the default file view set
-	    ** dont replace our optimized version  of the default file view with 
-            ** MPI_BYTE/MPI_BYTE, since the performance suffers terribly
-            ** if you do that.  Otherwise, pass the optimized version along, not the trivial version.    
-	    */
-	    if ( mca_io_ompio_default_file_view == fh->f_filetype ) {
-		/* don't do anything */
-		return OMPI_SUCCESS;
-	    }
-	    else {
-		filetype = mca_io_ompio_default_file_view;
-	    }
-	}		     
-    }
-
     if (NULL != fh->f_decoded_iov) {
         free (fh->f_decoded_iov);
         fh->f_decoded_iov = NULL;
@@ -204,12 +186,7 @@ int mca_io_ompio_file_get_view (struct ompi_file_t *fp,
 
     *disp = fh->f_disp;
     ompi_datatype_duplicate (fh->f_etype, etype);
-    if ( mca_io_ompio_default_file_view == fh->f_filetype ) {
-	ompi_datatype_duplicate ( &ompi_mpi_byte.dt, filetype);
-    }
-    else {
-	ompi_datatype_duplicate (fh->f_filetype, filetype);
-    }
+    ompi_datatype_duplicate (fh->f_filetype, filetype);
     strcpy (datarep, fh->f_datarep);
 
     return OMPI_SUCCESS;