diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-24 04:27:14 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-24 04:27:14 (GMT) |
| commit | caf3b0db1486e35d237181ae50b189d6fca5f417 (patch) | |
| tree | 11385e017d53c3b9bc4e6e69b559d881516502b8 | |
| parent | 9333a2e39c9a496f2a21a97d772493932c3f66d4 (diff) | |
| download | hdf5-caf3b0db1486e35d237181ae50b189d6fca5f417.zip hdf5-caf3b0db1486e35d237181ae50b189d6fca5f417.tar.gz hdf5-caf3b0db1486e35d237181ae50b189d6fca5f417.tar.bz2 | |
[svn-r29549] Minor normalization w/ revise_chunks in preparation for big merge.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial
autotools parallel (MPICH 3.1.4)
| -rw-r--r-- | src/H5Dchunk.c | 2 | ||||
| -rw-r--r-- | src/H5Dcontig.c | 2 | ||||
| -rw-r--r-- | src/H5Dpkg.h | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index a17e035..d8e8eb5 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -4316,7 +4316,7 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim) * Note that we only need to set scaled once, as the array's address * will never change. */ chk_store.chunk.scaled = scaled; - H5D_BUILD_IO_INFO_RD(&chk_io_info, dset, dxpl_cache, dxpl_id, &chk_store, NULL); + H5D_BUILD_IO_INFO_RD(&chk_io_info, dset, dxpl_cache, dxpl_id, H5AC_rawdata_dxpl_id, &chk_store, NULL); chk_io_info.raw_dxpl_id = H5AC_rawdata_dxpl_id; /* Compose chunked index info struct */ diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index c75ae43..a24abe6 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -270,7 +270,7 @@ H5D__contig_fill(const H5D_io_info_t *io_info) offset = 0; /* Simple setup for dataset I/O info struct */ - H5D_BUILD_IO_INFO_WRT(&ioinfo, dset, dxpl_cache, raw_dxpl_id, &store, fb_info.fill_buf); + H5D_BUILD_IO_INFO_WRT(&ioinfo, dset, dxpl_cache, H5AC_ind_read_dxpl_id, raw_dxpl_id, &store, fb_info.fill_buf); /* * Fill the entire current extent with the fill value. We can do diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h index 2629008..eabefc4 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -46,19 +46,19 @@ #define H5D_MINHDR_SIZE 256 /* [Simple] Macro to construct a H5D_io_info_t from it's components */ -#define H5D_BUILD_IO_INFO_WRT(io_info, ds, dxpl_c, dxpl_i, str, buf) \ +#define H5D_BUILD_IO_INFO_WRT(io_info, ds, dxpl_c, dxpl_m, dxpl_r, str, buf) \ (io_info)->dset = ds; \ (io_info)->dxpl_cache = dxpl_c; \ - (io_info)->raw_dxpl_id = dxpl_i; \ - (io_info)->md_dxpl_id = dxpl_i; \ + (io_info)->raw_dxpl_id = dxpl_r; \ + (io_info)->md_dxpl_id = dxpl_m; \ (io_info)->store = str; \ (io_info)->op_type = H5D_IO_OP_WRITE; \ (io_info)->u.wbuf = buf -#define H5D_BUILD_IO_INFO_RD(io_info, ds, dxpl_c, dxpl_i, str, buf) \ +#define H5D_BUILD_IO_INFO_RD(io_info, ds, dxpl_c, dxpl_m, dxpl_r, str, buf) \ (io_info)->dset = ds; \ (io_info)->dxpl_cache = dxpl_c; \ - (io_info)->raw_dxpl_id = dxpl_i; \ - (io_info)->md_dxpl_id = dxpl_i; \ + (io_info)->raw_dxpl_id = dxpl_r; \ + (io_info)->md_dxpl_id = dxpl_m; \ (io_info)->store = str; \ (io_info)->op_type = H5D_IO_OP_READ; \ (io_info)->u.rbuf = buf |