mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-31 17:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed HDF4 problem with allocated metadata storage

Browse Source
This commit is contained in:
Ed Hartnett 2010-07-06 14:56:28 +00:00
parent a106e959bc
commit 96970bba9e
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc4/nc4file.c
View File

@ -2065,6 +2065,7 @@ nc4_open_hdf4_file(const char *path, int mode, NC_FILE_INFO_T *nc)
if ((h5->sdid = SDstart(path, DFACC_READ)) == FAIL)
return NC_EHDFERR;
/* Learn how many datasets and global atts we have. */
if (SDfileinfo(h5->sdid, &num_datasets, &num_gatts))
return NC_EHDFERR;
@ -2146,6 +2147,15 @@ nc4_open_hdf4_file(const char *path, int mode, NC_FILE_INFO_T *nc)
var->fill_value = NULL;
}
/* Allocate storage for dimension info in this variable. */
if (var->ndims)
{
if (!(var->dim = malloc(sizeof(NC_DIM_INFO_T *) * var->ndims)))
return NC_ENOMEM;
if (!(var->dimids = malloc(sizeof(int) * var->ndims)))
return NC_ENOMEM;
}
/* Find its dimensions. */
for (d = 0; d < var->ndims; d++)
{

21
libsrc4/nc4hdf.c
View File

@ -1524,15 +1524,18 @@ nc4_adjust_var_cache(NC_GRP_INFO_T *grp, NC_VAR_INFO_T * var)
else
chunk_size_bytes *= sizeof(char *);
/* Is it too small? */
if (chunk_size_bytes > var->chunk_cache_size)
{
var->chunk_cache_size = chunk_size_bytes * DEFAULT_CHUNKS_IN_CACHE;
if (var->chunk_cache_size > MAX_DEFAULT_CACHE_SIZE)
var->chunk_cache_size = MAX_DEFAULT_CACHE_SIZE;
if ((retval = nc4_reopen_dataset(grp, var)))
return retval;
}
/* If the chunk cache is too small, and the user has not changed
* the default value of the chunk cache size, then increase the
* size of the cache. */
if (var->chunk_cache_size == CHUNK_CACHE_SIZE)
if (chunk_size_bytes > var->chunk_cache_size)
{
var->chunk_cache_size = chunk_size_bytes * DEFAULT_CHUNKS_IN_CACHE;
if (var->chunk_cache_size > MAX_DEFAULT_CACHE_SIZE)
var->chunk_cache_size = MAX_DEFAULT_CACHE_SIZE;
if ((retval = nc4_reopen_dataset(grp, var)))
return retval;
}
return NC_NOERR;
}

2
nc_test4/tst_camrun.c
View File

@ -2016,7 +2016,7 @@ main()
printf("data memory %d MB\n", memused);
#endif /* EXTRA_TESTS */
if (nc_set_chunk_cache(10000000, 1009, .75)) ERR;
if (nc_set_chunk_cache(0, 1009, .75)) ERR;
/* enter define mode */
if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR;