diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-06-05 19:06:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-06-05 19:06:24 (GMT) |
| commit | 28404e2813b982ea7374a8cd0513f9cf17a07c35 (patch) | |
| tree | 45d936ae77d8a28ac7f2dce09503608ca845752d | |
| parent | 339a81a766d4d37e6535f0c8fad7c853b9a849e9 (diff) | |
| download | hdf5-28404e2813b982ea7374a8cd0513f9cf17a07c35.zip hdf5-28404e2813b982ea7374a8cd0513f9cf17a07c35.tar.gz hdf5-28404e2813b982ea7374a8cd0513f9cf17a07c35.tar.bz2 | |
[svn-r8614] Purpose:
Refactor code
Description:
Move chunk and contiguous cached raw data from file information to dataset
information. This simplifies a number of internal interfaces, aligns the
code with it's purpose better and should allow more optimizations to the
chunked data I/O performance.
Platforms tested:
Solaris 2.7 (arabica)
FreeBSD 4.10 (sleipnir)
h5committest
| -rw-r--r-- | test/tmisc.c | 7 | ||||
| -rw-r--r-- | tools/misc/h5debug.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/tmisc.c b/test/tmisc.c index a6823d0..b8e850c 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -1971,8 +1971,11 @@ test_misc12(void) if(HDstrcmp(wdata1[i-MISC12_SPACE1_DIM1],rdata[i])) TestErrPrintf("Error on line %d: wdata1[%d]=%s, rdata[%d]=%s\n",__LINE__,i-MISC12_SPACE1_DIM1,wdata1[i-MISC12_SPACE1_DIM1],i,rdata[i]); + ret = H5Sselect_all (space); + CHECK(ret, FAIL, "H5Sselect_all"); + /* Reclaim VL data memory */ - ret = H5Dvlen_reclaim (tid1, sid1, H5P_DEFAULT, rdata); + ret = H5Dvlen_reclaim (tid1, space, H5P_DEFAULT, rdata); CHECK(ret, FAIL, "H5Dvlen_reclaim"); /* Close Everything */ @@ -3316,7 +3319,7 @@ test_misc20(void) hid_t sid; /* 'Space ID */ hid_t did; /* Dataset ID */ hid_t dcpl; /* Dataset creation property list ID */ - unsigned rank=MISC20_SPACE_RANK; /* Rank of dataspace */ + int rank=MISC20_SPACE_RANK; /* Rank of dataspace */ hsize_t big_dims[MISC20_SPACE_RANK]={MISC20_SPACE_DIM0,MISC20_SPACE_DIM1}; /* Large dimensions */ hsize_t small_dims[MISC20_SPACE_RANK]={MISC20_SPACE2_DIM0,MISC20_SPACE2_DIM1}; /* Small dimensions */ unsigned version; /* Version of storage layout info */ diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index 3643b25..487d1e9 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -29,6 +29,7 @@ #include "H5private.h" #include "H5Bprivate.h" +#include "H5Dprivate.h" #include "H5Fpkg.h" #include "H5Gprivate.h" #include "H5HGprivate.h" @@ -163,7 +164,7 @@ main(int argc, char *argv[]) case H5B_ISTORE_ID: ndims = (int)extra; - status = H5F_istore_debug (f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL, ndims); + status = H5D_istore_debug (f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL, ndims); break; default: |