diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-12-05 16:12:32 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-12-05 16:12:32 (GMT) |
| commit | a9c747deba6e588b2ec5bc624a53c976a9faa3bc (patch) | |
| tree | 4a9c1f2c4f2b383a62e2f9e8b87ab3ef154f810c /perform/chunk.c | |
| parent | 2167e3c495aada1c47375cdf923d26c583dce768 (diff) | |
| download | hdf5-a9c747deba6e588b2ec5bc624a53c976a9faa3bc.zip hdf5-a9c747deba6e588b2ec5bc624a53c976a9faa3bc.tar.gz hdf5-a9c747deba6e588b2ec5bc624a53c976a9faa3bc.tar.bz2 | |
[svn-r4669] Purpose:
Backward Compatibility Fix
Description:
One of H5P[gs]et_cache's parameters changed between v1.4 and the development
branch.
Solution:
Added v1.4 compat stuff around H5P[gs]et_cache implementation and testing
to allow v1.4.x users to continue to use their source code without
modification.
These changes are for everything except the FORTRAN wrappers - I spoke with
Elena and she will make the FORTRAN wrapper changes.
Platforms tested:
FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'perform/chunk.c')
| -rw-r--r-- | perform/chunk.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/perform/chunk.c b/perform/chunk.c index 5c023fa..0b915c8 100644 --- a/perform/chunk.c +++ b/perform/chunk.c @@ -162,13 +162,18 @@ create_dataset (void) *------------------------------------------------------------------------- */ static double -test_rowmaj (int op, hsize_t cache_size, hsize_t io_size) +test_rowmaj (int op, size_t cache_size, hsize_t io_size) { hid_t file, dset, mem_space, file_space; signed char *buf = calloc (1, SQUARE(io_size)); hsize_t i, j, hs_size[2]; hssize_t hs_offset[2]; +#ifdef H5_WANT_H5_V1_4_COMPAT int mdc_nelmts, rdcc_nelmts; +#else /* H5_WANT_H5_V1_4_COMPAT */ + int mdc_nelmts; + size_t rdcc_nelmts; +#endif /* H5_WANT_H5_V1_4_COMPAT */ double w0; H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0); @@ -237,14 +242,19 @@ test_rowmaj (int op, hsize_t cache_size, hsize_t io_size) *------------------------------------------------------------------------- */ static double -test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset) +test_diag (int op, size_t cache_size, hsize_t io_size, hsize_t offset) { hid_t file, dset, mem_space, file_space; hsize_t i, hs_size[2]; hsize_t nio = 0; hssize_t hs_offset[2]; signed char *buf = calloc (1, SQUARE (io_size)); +#ifdef H5_WANT_H5_V1_4_COMPAT int mdc_nelmts, rdcc_nelmts; +#else /* H5_WANT_H5_V1_4_COMPAT */ + int mdc_nelmts; + size_t rdcc_nelmts; +#endif /* H5_WANT_H5_V1_4_COMPAT */ double w0; H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0); @@ -315,7 +325,7 @@ main (void) hsize_t io_size; double effic, io_percent; FILE *f, *d; - int cache_size; + size_t cache_size; double w0; /* |