summaryrefslogtreecommitdiffstats
path: root/test/fheap.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-02-27 14:52:21 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-02-27 14:52:21 (GMT)
commit658bf4a8fb16cd3334b3fbfa2628226ffc20931f (patch)
treefea930220af70816b8ee849a24bb0c0e47c3acb9 /test/fheap.c
parent3713db1174ff83154ff63f93b4ba512eebed9748 (diff)
downloadhdf5-658bf4a8fb16cd3334b3fbfa2628226ffc20931f.zip
hdf5-658bf4a8fb16cd3334b3fbfa2628226ffc20931f.tar.gz
hdf5-658bf4a8fb16cd3334b3fbfa2628226ffc20931f.tar.bz2
[svn-r11968] Purpose:
Incrementtal checkin Description: Revise & update v2 B-tree code to separate the internal package-specific routines from the library-callable "private" routines. Similar updates for the fractal heap code. Platforms tested: FreeBSD 4.11 (sleipnir) Mac OSX (amazon)
Diffstat (limited to 'test/fheap.c')
-rw-r--r--test/fheap.c32
1 files changed, 20 insertions, 12 deletions
diff --git a/test/fheap.c b/test/fheap.c
index b1fce69..1a9f8e9 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -54,7 +54,7 @@ test_create(hid_t fapl)
hid_t file = -1; /* File ID */
char filename[1024]; /* Filename to use */
H5F_t *f = NULL; /* Internal file object pointer */
- H5HF_type_t heap_type, test_heap_type; /* Type of address mapping for fractal heap */
+ H5HF_create_t cparam, test_cparam; /* Creation parameters for heap */
haddr_t fh_addr; /* Address of fractal heap created */
/* Set the filename to use for this test (dependent on fapl) */
@@ -72,8 +72,10 @@ test_create(hid_t fapl)
* Test fractal heap creation (w/absolute address mapping)
*/
TESTING("Fractal heap creation (w/absolute address mapping)");
- heap_type = H5HF_ABSOLUTE;
- if(H5HF_create(f, H5P_DATASET_XFER_DEFAULT, heap_type, &fh_addr/*out*/) < 0)
+ cparam.addrmap = H5HF_ABSOLUTE;
+ cparam.standalone_size = 64 * 1024;
+ cparam.fixed_len_size = 0;
+ if(H5HF_create(f, H5P_DATASET_XFER_DEFAULT, &cparam, &fh_addr/*out*/) < 0)
FAIL_STACK_ERROR
if(!H5F_addr_defined(fh_addr))
FAIL_STACK_ERROR
@@ -81,10 +83,10 @@ test_create(hid_t fapl)
/* Query the type of address mapping */
TESTING("Query absolute address mapping setting");
- test_heap_type = H5HF_MAPPED;
- if(H5HF_get_addrmap_test(f, H5P_DATASET_XFER_DEFAULT, fh_addr, &test_heap_type) < 0)
+ HDmemset(&test_cparam, 0, sizeof(H5HF_create_t));
+ if(H5HF_get_cparam_test(f, H5P_DATASET_XFER_DEFAULT, fh_addr, &test_cparam) < 0)
FAIL_STACK_ERROR
- if(test_heap_type != heap_type)
+ if(HDmemcmp(&cparam, &test_cparam, sizeof(H5HF_create_t)))
FAIL_STACK_ERROR
PASSED()
@@ -92,8 +94,10 @@ test_create(hid_t fapl)
* Test fractal heap creation (w/mapped address mapping)
*/
TESTING("Fractal heap creation (w/mapped address mapping)");
- heap_type = H5HF_MAPPED;
- if(H5HF_create(f, H5P_DATASET_XFER_DEFAULT, heap_type, &fh_addr/*out*/) < 0)
+ cparam.addrmap = H5HF_MAPPED;
+ cparam.standalone_size = 64 * 1024;
+ cparam.fixed_len_size = 0;
+ if(H5HF_create(f, H5P_DATASET_XFER_DEFAULT, &cparam, &fh_addr/*out*/) < 0)
FAIL_STACK_ERROR
if(!H5F_addr_defined(fh_addr))
FAIL_STACK_ERROR
@@ -101,10 +105,10 @@ test_create(hid_t fapl)
/* Query the type of address mapping */
TESTING("Query mapped address mapping setting");
- test_heap_type = H5HF_ABSOLUTE;
- if(H5HF_get_addrmap_test(f, H5P_DATASET_XFER_DEFAULT, fh_addr, &test_heap_type) < 0)
+ HDmemset(&test_cparam, 0, sizeof(H5HF_create_t));
+ if(H5HF_get_cparam_test(f, H5P_DATASET_XFER_DEFAULT, fh_addr, &test_cparam) < 0)
FAIL_STACK_ERROR
- if(test_heap_type != heap_type)
+ if(HDmemcmp(&cparam, &test_cparam, sizeof(H5HF_create_t)))
FAIL_STACK_ERROR
PASSED()
@@ -144,6 +148,7 @@ test_abs_insert_first(hid_t fapl)
hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */
char filename[1024]; /* Filename to use */
H5F_t *f = NULL; /* Internal file object pointer */
+ H5HF_create_t cparam; /* Creation parameters for heap */
haddr_t fh_addr; /* Address of fractal heap created */
unsigned char obj[10]; /* Buffer for object to insert */
haddr_t heap_id; /* Heap ID for object inserted */
@@ -162,7 +167,10 @@ test_abs_insert_first(hid_t fapl)
STACK_ERROR
/* Create absolute heap */
- if(H5HF_create(f, dxpl, H5HF_ABSOLUTE, &fh_addr/*out*/) < 0)
+ cparam.addrmap = H5HF_ABSOLUTE;
+ cparam.standalone_size = 64 * 1024;
+ cparam.fixed_len_size = 0;
+ if(H5HF_create(f, dxpl, &cparam, &fh_addr/*out*/) < 0)
FAIL_STACK_ERROR
if(!H5F_addr_defined(fh_addr))
FAIL_STACK_ERROR