[svn-r5670] Purpose:

    Code cleanup

Description:
    Remove "COALESCE_READS" ifdefs, which were brought in by the DPSS VFL
    driver and are no longer used.

Platforms tested:
    IRIX64 6.5 (modi4) w/parallel

3 files changed, 0 insertions, 26 deletions

diff --git a/src/H5D.c b/src/H5D.c
index ac63596..3b14c43 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -157,9 +157,6 @@ H5D_init_interface(void)
     void            *def_vlen_free_info      = H5D_XFER_VLEN_FREE_INFO_DEF;
     hid_t           def_vfl_id               = H5D_XFER_VFL_ID_DEF;     
     void            *def_vfl_info            = H5D_XFER_VFL_INFO_DEF;    
-#ifdef COALESCE_READS
-    hsize_t         def_gather_reads         = H5D_XFER_GATHER_READS_DEF;   
-#endif /* COALESCE_READS */
     size_t          def_hyp_vec_size         = H5D_XFER_HYPER_VECTOR_SIZE_DEF; 
 
     /* Dataset creation property class variables.  In sequence, they are,
@@ -258,12 +255,6 @@ H5D_init_interface(void)
         if(H5P_register(xfer_pclass,H5D_XFER_VFL_INFO_NAME,H5D_XFER_VFL_INFO_SIZE,&def_vfl_info,NULL,NULL,NULL,NULL,NULL,NULL)<0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class");
 
-#ifdef COALESCE_READS
-        /* Register the 'gather reads' property */
-        if(H5P_register(xfer_pclass,H5D_XFER_GATHER_READS_NAME,H5D_XFER_GATHER_READS_SIZE,&def_gather_reads,NULL,NULL,NULL,NULL,NULL)<0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class");
-#endif /* COALESCE_READS */
-
         /* Register the vector size property */
         if(H5P_register(xfer_pclass,H5D_XFER_HYPER_VECTOR_SIZE_NAME,H5D_XFER_HYPER_VECTOR_SIZE_SIZE,&def_hyp_vec_size,NULL,NULL,NULL,NULL,NULL,NULL)<0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class");
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 2c17c26..b0b1609 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -136,12 +136,6 @@
 #define H5D_XFER_VFL_INFO_NAME       "vfl_info"
 #define H5D_XFER_VFL_INFO_SIZE       sizeof(void *)
 #define H5D_XFER_VFL_INFO_DEF  NULL
-#ifdef COALESCE_READS
-/* Definitions for 'gather reads' property */
-#define H5D_XFER_GATHER_READS_NAME       "gather_reads"
-#define H5D_XFER_GATHER_READS_SIZE       sizeof(hsize_t)
-#define H5D_XFER_GATHER_READS_DEF  0
-#endif /* COALESCE_READS */
 /* Definitions for hyperslab vector size property */
 #define H5D_XFER_HYPER_VECTOR_SIZE_NAME       "vec_size"
 #define H5D_XFER_HYPER_VECTOR_SIZE_SIZE       sizeof(size_t)
diff --git a/src/H5Farray.c b/src/H5Farray.c
index 7d046cd..b019ee8 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -150,9 +150,6 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
     H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT;
     H5P_genplist_t *plist=NULL;                 /* Property list */
 #endif
-#ifdef COALESCE_READS
-    hsize_t gather_reads;                       /* # of MPIO reads to gather */
-#endif
     herr_t      ret_value = SUCCEED;            /* Return value */
    
     FUNC_ENTER_NOAPI(H5F_arr_read, FAIL);
@@ -278,15 +275,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
             }
 #endif
 
-#ifdef COALESCE_READS
-            for (z=0, gather_reads = nelmts - 1; z<nelmts; z++, gather_reads--) {
-                /* Track the number of reads to gather */
-                if(H5P_set(plist, H5D_XFER_GATHER_READS_NAME, &gather_reads)<0)
-                    HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve gather reads");
-#else
             for (z=0; z<nelmts; z++) {
-#endif
-
                 /* Read directly from file if the dataset is in an external file */
                 /* Note: We can't use data sieve buffers for datasets in external files
                  *  because the 'addr' of all external files is set to 0 (above) and