mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the handling of hdf5 initialization by

Browse Source 
creating an nc4_hdf5_initialize(void) function
plus nc4_hdf5_initialized flag.
Also fix potential null exception in nc4internal.c
This commit is contained in:
Dennis Heimbigner 2016-01-28 15:03:40 -07:00
parent f85d8a0ead
commit b5ba424793
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nc4internal.h
View File

@ -401,6 +401,10 @@ int nc4_check_name(const char *name, char *norm_name);
int nc4_normalize_name(const char *name, char *norm_name);
int nc4_check_dup_name(NC_GRP_INFO_T *grp, char *norm_name);
/* HDF5 initialization */
int nc4_hdf5_initialized;
void nc4_hdf5_initialize(void);
/* This is only included if --enable-logging is used for configure; it
prints info about the metadata to stderr. */
#ifdef LOGGING

25
libsrc4/nc4file.c
View File

@ -86,10 +86,6 @@ size_t nc4_chunk_cache_size = CHUNK_CACHE_SIZE;
size_t nc4_chunk_cache_nelems = CHUNK_CACHE_NELEMS;
float nc4_chunk_cache_preemption = CHUNK_CACHE_PREEMPTION;
/* To turn off HDF5 error messages, I have to catch an early
invocation of a netcdf function. */
static int virgin = 1;
/* For performance, fill this array only the first time, and keep it
* in global memory for each further use. */
#define NUM_TYPES 12
@ -491,13 +487,8 @@ NC4_create(const char* path, int cmode, size_t initialsz, int basepe,
#endif /* USE_PARALLEL4 */
/* If this is our first file, turn off HDF5 error messages. */
if (virgin)
{
if (H5Eset_auto(NULL, NULL) < 0)
LOG((0, "Couldn't turn off HDF5 error messages!"));
LOG((1, "HDF5 error messages have been turned off."));
virgin = 0;
}
if (!nc4_hdf5_initialized)
nc4_hdf5_initialize();
/* Check the cmode for validity. */
if((cmode & ILLEGAL_CREATE_FLAGS) != 0)
@ -2789,15 +2780,9 @@ NC4_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
parameters = &mpidfalt;
#endif /* USE_PARALLEL4 */
/* If this is our first file, turn off HDF5 error messages. */
if (virgin)
{
if (H5Eset_auto(NULL, NULL) < 0)
LOG((0, "Couldn't turn off HDF5 error messages!"));
LOG((1, "HDF5 error messages turned off!"));
virgin = 0;
}
/* If this is our first file, initialize HDF5. */
if (!nc4_hdf5_initialized)
nc4_hdf5_initialize();
/* Check the mode for validity */
if((mode & ILLEGAL_OPEN_FLAGS) != 0)

28
libsrc4/nc4internal.c
View File

@ -45,6 +45,21 @@ int nc_log_level = -1;
#endif /* LOGGING */
int nc4_hdf5_initialized = 0;
/*
Provide a function to do any necessary initialization
of the HDF5 library.
*/
void
nc4_hdf5_initialize(void)
{
if (H5Eset_auto(NULL, NULL) < 0)
LOG((0, "Couldn't turn off HDF5 error messages!"));
LOG((1, "HDF5 error messages have been turned off."));
nc4_hdf5_initialized = 1;
}
/* Check and normalize and name. */
int
nc4_check_name(const char *name, char *norm_name)
@ -529,10 +544,12 @@ nc4_find_grp_att(NC_GRP_INFO_T *grp, int varid, const char *name, int attnum,
/* Now find the attribute by name or number. If a name is provided,
* ignore the attnum. */
for (*att = attlist; *att; *att = (*att)->l.next)
if ((name && !strcmp((*att)->name, name)) ||
(!name && (*att)->attnum == attnum))
return NC_NOERR;
for (*att = attlist; *att; *att = (*att)->l.next) {
if (name && (*att)->name && !strcmp((*att)->name, name))
return NC_NOERR;
if (!name && (*att)->attnum == attnum)
return NC_NOERR;
}
/* If we get here, we couldn't find the attribute. */
return NC_ENOTATT;
@ -1387,6 +1404,9 @@ nc4_normalize_name(const char *name, char *norm_name)
int
nc_set_log_level(int new_level)
{
if(!nc4_hdf5_initialized)
nc4_hdf5_initialize();
/* If the user wants to completely turn off logging, turn off HDF5
logging too. Now I truely can't think of what to do if this
fails, so just ignore the return code. */