diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2012-03-30 19:34:20 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2012-03-30 19:34:20 (GMT) |
| commit | 56d950d3264aae3d935854470a9178a333614bff (patch) | |
| tree | e74485f6148c1c598b9961556820f7ddec7444f3 /c++/src/H5PredType.h | |
| parent | 7f7b8bd9725854fc8b546bcde3252f2c8d5c5d32 (diff) | |
| download | hdf5-56d950d3264aae3d935854470a9178a333614bff.zip hdf5-56d950d3264aae3d935854470a9178a333614bff.tar.gz hdf5-56d950d3264aae3d935854470a9178a333614bff.tar.bz2 | |
[svn-r22209] Purpose: Fixed bugs HDFFV-2761 & HDFFV-7852
Description:
- Replaced PredType::NotAtexit() with PredType::AtExit(H5CPP_EXITED)
and used PredType::AtExit as a flag to detect when all predefined
types have been destroyed. Then, H5close will be called to terminate
the library after its being re-initiated when the PredType destructors
were activated. This change removed the memory leaks shown by the
user's sample program in HDFFV-2761.
- Added H5CPP_EXITED for PredType::AtExit to use as a flag
- Rearranged constructors in CompType to fix bug HDFFV-7852
- Updated some inaccurate comments
- Removed stream functions from FileAccPropList
- Replaced H5_VMS with appropriate macro in H5IdComponent.cpp
Platforms tested:
Linux/32 2.6 (jam)
Linux/64 2.6 (amani)
SunOS 5.10 (linew)
Diffstat (limited to 'c++/src/H5PredType.h')
| -rw-r--r-- | c++/src/H5PredType.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h index 5b2fffb..9cb1c65 100644 --- a/c++/src/H5PredType.h +++ b/c++/src/H5PredType.h @@ -26,6 +26,14 @@ namespace H5 { #endif +/* This constant is defined for a workaround to eliminate memory leaks due to + the library being re-initiated when PredType destructors are invoked. A + PredType instant with H5CPP_EXITED as the value of its "id" is constructed + before the other PredType objects are created. At exit, when this special + PredType object is to be destructed, no HDF5 library function will be called + and the library will be terminated. -BMR, Mar 30, 2012 */ +#define H5CPP_EXITED -3 // -3 is less likely to be used elsewhere + class H5_DLLCPP PredType : public AtomType { public: ///\brief Returns this class name @@ -229,9 +237,10 @@ class H5_DLLCPP PredType : public AtomType { #endif // DOXYGEN_SHOULD_SKIP_THIS private: - // added this to work around the atexit/global destructor problem - // temporarily - it'll prevent the use of atexit to clean up - static const PredType NotAtexit; // not working yet + // Added this to work around the atexit/global destructor problem. + // It'll help to terminate the library after other PredType instances + // are closed. -BMR, Mar 30, 2012 + static const PredType AtExit; protected: #ifndef DOXYGEN_SHOULD_SKIP_THIS |