summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2002-06-12 17:01:01 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2002-06-12 17:01:01 (GMT)
commitbdefbb5cba63402c819819545c3d45e862540ee6 (patch)
treebce893e3521d102b0b428a937a0944da8a7b34e9 /test
parent3bbc9285cf7bda368f18cc724f14edcf2828a0ea (diff)
downloadhdf5-bdefbb5cba63402c819819545c3d45e862540ee6.zip
hdf5-bdefbb5cba63402c819819545c3d45e862540ee6.tar.gz
hdf5-bdefbb5cba63402c819819545c3d45e862540ee6.tar.bz2
[svn-r5603] Purpose:
Bug fix Description: I/O on "Regular" hyperslab selections could fail to transfer correctly if the number of elements in the selection's row did now fit "evenly" into the buffer being used for the transfer. Solution: Correct the calculation of the block & count offsets within the optimized "regular" hyperslab routines. Platforms tested: FreeBSD 4.5 (sleipnir)
Diffstat (limited to 'test')
-rw-r--r--test/tselect.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/tselect.c b/test/tselect.c
index 7358d5b..c4587cf 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -939,7 +939,7 @@ compare_size_t(const void *s1, const void *s2)
**
****************************************************************/
static void
-test_select_hyper_stride(void)
+test_select_hyper_stride(hid_t xfer_plist)
{
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
@@ -1026,7 +1026,7 @@ test_select_hyper_stride(void)
dataset=H5Dcreate(fid1,"Dataset1",H5T_STD_U16LE,sid1,H5P_DEFAULT);
/* Write selection to disk */
- ret=H5Dwrite(dataset,H5T_NATIVE_USHORT,sid2,sid1,H5P_DEFAULT,wbuf);
+ ret=H5Dwrite(dataset,H5T_NATIVE_USHORT,sid2,sid1,xfer_plist,wbuf);
CHECK(ret, FAIL, "H5Dwrite");
/* Close memory dataspace */
@@ -1046,7 +1046,7 @@ test_select_hyper_stride(void)
CHECK(ret, FAIL, "H5Sselect_hyperslab");
/* Read selection from disk */
- ret=H5Dread(dataset,H5T_NATIVE_USHORT,sid2,sid1,H5P_DEFAULT,rbuf);
+ ret=H5Dread(dataset,H5T_NATIVE_USHORT,sid2,sid1,xfer_plist,rbuf);
CHECK(ret, FAIL, "H5Dread");
/* Sort the locations into the proper order */
@@ -4996,7 +4996,7 @@ test_select(void)
CHECK(plist_id, FAIL, "H5Pcreate");
/* test I/O with a very small buffer for reads */
- ret=H5Pset_buffer(plist_id,128,NULL,NULL);
+ ret=H5Pset_buffer(plist_id,59,NULL,NULL);
CHECK(ret, FAIL, "H5Pset_buffer");
/* These next tests use the same file */
@@ -5011,7 +5011,8 @@ test_select(void)
/* These next tests use the same file */
test_select_combo(); /* Test combined hyperslab & element selection code */
- test_select_hyper_stride(); /* Test strided hyperslab selection code */
+ test_select_hyper_stride(H5P_DEFAULT); /* Test strided hyperslab selection code */
+ test_select_hyper_stride(plist_id); /* Test strided hyperslab selection code */
test_select_hyper_contig(H5T_STD_U16LE,H5P_DEFAULT); /* Test contiguous hyperslab selection code */
test_select_hyper_contig(H5T_STD_U16LE,plist_id); /* Test contiguous hyperslab selection code */
test_select_hyper_contig(H5T_STD_U16BE,H5P_DEFAULT); /* Test contiguous hyperslab selection code */