[dcmf] [PATCH 2/3] Use naive strided routines for af_ufs.

[Bob Cernohous]

Signed-off-by: Bob Cernohous <bobc at us.ibm.com>
---
 .../src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c       |   25 ++++++++++++++-----
 lib/mpi/mpich2/src/mpi/romio/adio/ad_ufs/ad_ufs.c  |    4 +-
 2 files changed, 20 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 lib/mpi/mpich2/src/mpi/romio/adio/ad_ufs/ad_ufs.c

diff --git a/lib/mpi/mpich2/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c b/lib/mpi/mpich2/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c
index 144e722..aa933a3 100644
--- a/lib/mpi/mpich2/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c
+++ b/lib/mpi/mpich2/src/mpi/romio/adio/ad_bgl/ad_bgl_hints.c
@@ -101,13 +101,24 @@ void ADIOI_BGL_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
 	MPI_Info_set(info, "ind_wr_buffer_size", ADIOI_BGL_IND_WR_BUFFER_SIZE_DFLT);
 	fd->hints->ind_wr_buffer_size = atoi(ADIOI_BGL_IND_WR_BUFFER_SIZE_DFLT);
 
-	/* default is to let romio automatically decide when to use data
-	 * sieving
-	 */
-	MPI_Info_set(info, "romio_ds_read", "automatic"); 
-	fd->hints->ds_read = ADIOI_HINT_AUTO;
-	MPI_Info_set(info, "romio_ds_write", "automatic"); 
-	fd->hints->ds_write = ADIOI_HINT_AUTO;
+  if(fd->file_system == ADIO_UFS)
+  {
+    /* default for ufs/pvfs is to disable data sieving  */
+    MPI_Info_set(info, "romio_ds_read", "disable"); 
+    fd->hints->ds_read = ADIOI_HINT_DISABLE;
+    MPI_Info_set(info, "romio_ds_write", "disable"); 
+    fd->hints->ds_write = ADIOI_HINT_DISABLE;
+  }
+  else
+  {
+    /* default is to let romio automatically decide when to use data
+     * sieving
+     */
+    MPI_Info_set(info, "romio_ds_read", "automatic"); 
+    fd->hints->ds_read = ADIOI_HINT_AUTO;
+    MPI_Info_set(info, "romio_ds_write", "automatic"); 
+    fd->hints->ds_write = ADIOI_HINT_AUTO;
+  }
 
 	fd->hints->initialized = 1;
     }
diff --git a/lib/mpi/mpich2/src/mpi/romio/adio/ad_ufs/ad_ufs.c b/lib/mpi/mpich2/src/mpi/romio/adio/ad_ufs/ad_ufs.c
old mode 100755
new mode 100644
index ce0f6a5..a13ef78
--- a/lib/mpi/mpich2/src/mpi/romio/adio/ad_ufs/ad_ufs.c
+++ b/lib/mpi/mpich2/src/mpi/romio/adio/ad_ufs/ad_ufs.c
@@ -20,8 +20,8 @@ struct ADIOI_Fns_struct ADIO_UFS_operations = {
     ADIOI_GEN_SeekIndividual, /* SeekIndividual */
     ADIOI_GEN_Fcntl, /* Fcntl */
     ADIOI_BGL_SetInfo, /* SetInfo */
-    ADIOI_GEN_ReadStrided, /* ReadStrided */
-    ADIOI_NOLOCK_WriteStrided, /* WriteStrided */
+    ADIOI_GEN_ReadStrided_naive, /*ADIOI_GEN_ReadStrided, * ReadStrided */
+    ADIOI_GEN_WriteStrided_naive, /*ADIOI_NOLOCK_WriteStrided, * WriteStrided */
     ADIOI_BGL_Close, /* Close */
 #ifdef ROMIO_HAVE_WORKING_AIO
     ADIOI_GEN_IreadContig, /* IreadContig */
-- 
1.5.3.7