diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-16 02:19:11 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-16 02:19:11 (GMT) |
commit | 84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb (patch) | |
tree | 5680e556dbb0971024bcea8911beb7efebc184c1 /c++ | |
parent | 31683703d9bf394cef27805c50fc89efa29361b9 (diff) | |
download | hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.zip hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.tar.gz hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.tar.bz2 |
[svn-r28093] Merge of r27768 and r27774 from trunk
Description:
Complete revamp of package initialization/shutdown mechanism in the library.
Each package now has a single init/term routine.
This new way should avoid packages being re-initialized during library
shutdown and is also be _much_ more proactive about giving feedback for
resource leaks internal to the library.
Introduces a new "module" header file for packages in the library
(e.g src/H5Fmodule.h) which sets up some necessary package configuration macros
for the FUNC_ENTER/LEAVE macros. (The VFL drivers have their own slightly
modified version of this header, src/H5FDdrvr_module.h)
Also cleaned up a bunch of resources leaks all across the library and tests,
along with addressing many warnings, as I encountered them.
Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
serial and parallel (MPICH 3.1.4)
Diffstat (limited to 'c++')
-rw-r--r-- | c++/test/testhdf5.cpp | 1 | ||||
-rw-r--r-- | c++/test/tlinks.cpp | 4 | ||||
-rw-r--r-- | c++/test/ttypes.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp index 19b4f0d..59b16cf 100644 --- a/c++/test/testhdf5.cpp +++ b/c++/test/testhdf5.cpp @@ -134,3 +134,4 @@ Comment out tests that are not done yet */ return (GetTestNumErrs()); } + diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp index 33d10ea..572f649 100644 --- a/c++/test/tlinks.cpp +++ b/c++/test/tlinks.cpp @@ -47,7 +47,7 @@ * This file needs to access private information from the H5G package. * This file also needs to access the group testing code. */ -//#define H5G_PACKAGE +//#define H5G_FRIEND //#define H5G_TESTING //#include "h5test.h" @@ -622,7 +622,7 @@ void test_links() /* Close 2nd FAPL */ H5Pclose(fapl2_id); - h5_cleanup(FILENAME, fapl_id); + h5_clean_files(FILENAME, fapl_id); /* Test that external links can be used after a library reset. MUST be * called last so the reset doesn't interfere with the property lists. This diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index 2e64051..aae5d86 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -57,7 +57,7 @@ /* Alignment test stuff */ #ifdef TEST_ALIGNMENT -#define H5T_PACKAGE +#define H5T_FRIEND #include "H5Tpkg.h" #endif #define SET_ALIGNMENT(TYPE,VAL) \ |