summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-06-05 19:06:29 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-06-05 19:06:29 (GMT)
commit9cd4e394dbbcdb9d790fdc5cb07557ea14819098 (patch)
tree039eea80db5704ba33ac56f0120d7d3a99bd46b7
parent60c6500fad6e102ed3535f12d3f3edf55ff6fed6 (diff)
downloadhdf5-9cd4e394dbbcdb9d790fdc5cb07557ea14819098.zip
hdf5-9cd4e394dbbcdb9d790fdc5cb07557ea14819098.tar.gz
hdf5-9cd4e394dbbcdb9d790fdc5cb07557ea14819098.tar.bz2
[svn-r8615] 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.c5
-rw-r--r--tools/misc/h5debug.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/test/tmisc.c b/test/tmisc.c
index 9667e4f..acc12c2 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1985,8 +1985,11 @@ test_misc12(void)
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]);
} /* end if */
+ 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 */
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index a27a4db..e215036 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -28,14 +28,15 @@
#define H5O_PACKAGE /*suppress error about including H5Opkg */
#include "H5private.h"
-#include "H5Iprivate.h"
#include "H5Bprivate.h"
-#include "H5Pprivate.h"
+#include "H5Dprivate.h"
#include "H5Fpkg.h"
#include "H5Gprivate.h"
#include "H5HGprivate.h"
#include "H5HLprivate.h"
+#include "H5Iprivate.h"
#include "H5Opkg.h"
+#include "H5Pprivate.h"
/* File drivers */
#include "H5FDfamily.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: