[svn-r5671] 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 017bd54..2fc1337 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -94,10 +94,6 @@ H5D_xfer_t	H5D_xfer_dflt = {
     NULL,                   	/*No information needed for free() calls    */
     H5FD_VFD_DEFAULT,			/*See H5Pget_driver()			    */
     NULL,			/*No file driver-specific information yet   */
-#ifdef COALESCE_READS
-    0,                          /*coalesce single reads into a read         */
-                                /*transaction                               */
-#endif
 #ifdef H5_HAVE_PARALLEL
     0,                          /* Whether to use a view for this I/O */
     MPI_DATATYPE_NULL,          /* MPI type for buffer (memory) */
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index f260253..37630d2 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -68,10 +68,6 @@ typedef struct H5D_xfer_t {
     void		*free_info;	/*VL datatype free information	     */
     hid_t		driver_id;	/*File driver ID		     */
     void		*driver_info;	/*File driver specific information   */
-#ifdef COALESCE_READS
-    unsigned               gather_reads;   /*coalesce single reads into a read  */
-                                        /*transaction                        */
-#endif
 #ifdef H5_HAVE_PARALLEL
     unsigned            use_view;       /* Whether to use a view for this I/O */
     MPI_Datatype        btype;          /* MPI type for buffer (memory) */
diff --git a/src/H5Farray.c b/src/H5Farray.c
index 4d5bf36..7026352 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -162,9 +162,6 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 #ifdef H5_HAVE_PARALLEL
     H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT;
 #endif
-#ifdef COALESCE_READS
-    H5D_xfer_t *xfer_parms;                     /*transfer property list*/
-#endif
    
     FUNC_ENTER(H5F_arr_read, FAIL);
 
@@ -297,27 +294,12 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
             }
 #endif
 
-#ifdef COALESCE_READS
-                /* Get the dataset transfer property list */
-                if (H5P_DEFAULT == dxpl_id) {
-                    xfer_parms = &H5D_xfer_dflt;
-                } else if (H5P_DATASET_XFER != H5P_get_class (dxpl_id) ||
-                       NULL == (xfer_parms = H5I_object (dxpl_id))) {
-                    HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
-                }
-
-            for (z=0, xfer_parms->gather_reads = nelmts - 1;
-                     z<nelmts;
-                     z++, xfer_parms->gather_reads--) {
-#else
 #ifdef QAK
         printf("%s: nelmts=%d, addr=%lu, elmt_size=%lu\n",FUNC,(int)nelmts,(unsigned long)addr,(unsigned long)elmt_size);
         printf("%s: sieve_buf=%p, sieve_loc=%lu, sieve_size=%lu, sieve_buf_size=%lu, sieve_dirty=%u\n",FUNC,f->shared->sieve_buf,(unsigned long)f->shared->sieve_loc,(unsigned long)f->shared->sieve_size,(unsigned long)f->shared->sieve_buf_size,(unsigned)f->shared->sieve_dirty);
         printf("%s: feature_flags=%lx\n",FUNC,(unsigned long)f->shared->lf->feature_flags);
 #endif /* QAK */
             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