mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix (again) jira NCF-248.

Browse Source 
So, it turns out that just freeing
the nc4_info is not enough;
The root group must also be reclaimed.
So, it appears the best approach
is to invoke an abort on the
failed file.
This commit is contained in:
Dennis Heimbigner 2013-04-24 22:11:44 +00:00
parent 2ee115d4e1
commit 4070bcf946
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Make0
View File

@ -1,6 +1,6 @@
# Test c output
T=test_nc4
#VG=valgrind --leak-check=full
T=leak
VG=valgrind --leak-check=full
CFLAGS=-g -O0 -I. -I./include
@ -10,9 +10,9 @@ LFLAG=-L/usr/local/lib
RPATH=-Wl,-rpath,${LFLAG}
all::
export CFLAGS; export LDFLAGS; \
${MAKE} all ; \
gcc ${CFLAGS} -o t ${T}.c ${LDFLAGS}
${VG} ./t
build::
export CFLAGS; export LDFLAGS; ${MAKE} all

2
cf
View File

@ -40,7 +40,7 @@ CC=gcc
fi
# Default cases
if test -f "/share/ed/local" ; then
if test -e "/share/ed/local/${HOST}" ; then
stddir="/share/ed/local/${HOST}"
else
stddir="/usr/local"

25
libsrc4/nc4file.c
View File

@ -46,6 +46,7 @@ extern int num_spaces;
static int NC4_enddef(int ncid);
static int nc4_rec_read_types(NC_GRP_INFO_T *grp);
static int nc4_rec_read_vars(NC_GRP_INFO_T *grp);
static int close_netcdf4_file(NC_HDF5_FILE_INFO_T *h5, int abort);
#ifdef IGNORE
/* This extern points to the pointer that holds the list of open
@ -355,10 +356,17 @@ exit: /*failure exit*/
#ifdef EXTRA_TESTS
num_plists--;
#endif
if (fapl_id != H5P_DEFAULT) H5Pclose(fapl_id);
if(!nc4_info) return retval;
close_netcdf4_file(nc4_info,1); // treat like abort
#if 0
if (nc4_info->hdfid > 0) H5Fclose(nc4_info->hdfid);
/* Reclaim nc4_info */
if (nc4_info->root_grp) {
free(nc4_info->root_grp->name);
free(nc4_info->root_grp);
}
free(nc4_info);
#endif
return retval;
}
@ -2381,8 +2389,15 @@ nc4_open_file(const char *path, int mode, MPI_Comm comm,
num_plists--;
#endif
if (!nc4_info) return retval;
close_netcdf4_file(nc4_info,1); // treat like abort
#if 0
if (nc4_info->hdfid > 0) H5Fclose(nc4_info->hdfid);
if (nc4_info->root_grp) {
free(nc4_info->root_grp->name);
free(nc4_info->root_grp);
}
free(nc4_info);
#endif
return retval;
}
@ -3108,16 +3123,18 @@ close_netcdf4_file(NC_HDF5_FILE_INFO_T *h5, int abort)
retval = NC_EHDFERR; goto done;
}
}
/* if (H5garbage_collect() < 0)
{retval = NC_EHDFERR; goto done; */
#if 0
if (H5garbage_collect() < 0)
{retval = NC_EHDFERR; goto done;
#endif
}
done:
/* Free the nc4_info struct; above code should have reclaimed
everything else */
if(h5 != NULL)
free(h5);
done:
return retval;
}