[svn-r12368] Purpose: Fixed bug

Description: Shanti compiler destroy unnamed objects later than others, which caused some reference counting test fail. Revised the test so that destructors are called at the same time, regardless the differences of compiler implementation. Revised some constructors, close, operator=, and destructors to make sure that all the object ids are handled properly. Platforms tested: Linux 2.4 (heping) SunOS 5.9 (shanti) HPUX 11.00 (kelgia) AIX 5.1 (copper)
2025-01-24 15:25:00 +08:00 · 2006-05-23 12:59:40 -05:00 · 2006-05-23 12:59:40 -05:00 · deec486732
commit deec486732
parent d0f565c5c0
10 changed files with 164 additions and 161 deletions
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@ -269,6 +269,8 @@ H5std_string Attribute::getName() const
 // Programmer	Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
 void Attribute::close()
+{
+    if (p_valid_id(id))
    {
 	herr_t ret_value = H5Aclose(id);
 	if( ret_value < 0 )
@ -278,6 +280,7 @@ void Attribute::close()
 	// reset the id because the attribute that it represents is now closed
 	id = 0;
    }
+}

 //--------------------------------------------------------------------------
 // Function:	Attribute::getStorageSize
@ -304,9 +307,8 @@ hsize_t Attribute::getStorageSize() const
 //--------------------------------------------------------------------------
 Attribute::~Attribute()
 {
-   // The attribute id will be closed properly
    try {
-      decRefCount();
+	close();
    }
    catch (Exception close_error) {
 	cerr << "Attribute::~Attribute - " << close_error.getDetailMsg() << endl;
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@ -520,6 +520,8 @@ DataSpace DataSet::getRegion(void *ref, H5R_type_t ref_type) const
 // Programmer	Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
 void DataSet::close()
+{
+    if (p_valid_id(id))
    {
 	herr_t ret_value = H5Dclose( id );
 	if( ret_value < 0 )
@ -529,6 +531,7 @@ void DataSet::close()
 	// reset the id because the dataset that it represents is now closed
 	id = 0;
    }
+}

 //--------------------------------------------------------------------------
 // Function:	DataSet destructor
@ -540,9 +543,8 @@ void DataSet::close()
 //--------------------------------------------------------------------------
 DataSet::~DataSet()
 {
-    // The dataset id will be closed properly
    try {
-        decRefCount();
+	close();
    }
    catch (Exception close_error) {
 	cerr << "DataSet::~DataSet - " << close_error.getDetailMsg() << endl;
--- a/c++/src/H5DataSpace.cpp
+++ b/c++/src/H5DataSpace.cpp
@ -46,7 +46,7 @@ const DataSpace DataSpace::ALL( H5S_ALL );
 ///\exception	H5::DataSpaceIException
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataSpace::DataSpace( H5S_class_t type ) : IdComponent()
+DataSpace::DataSpace( H5S_class_t type ) : IdComponent(0)
 {
   id = H5Screate( type );
   if( id < 0 )
@ -64,7 +64,7 @@ DataSpace::DataSpace( H5S_class_t type ) : IdComponent()
 ///\exception	H5::DataSpaceIException
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataSpace::DataSpace( int rank, const hsize_t * dims, const hsize_t * maxdims) : IdComponent()
+DataSpace::DataSpace( int rank, const hsize_t * dims, const hsize_t * maxdims) : IdComponent(0)
 {
   id = H5Screate_simple( rank, dims, maxdims );
   if( id < 0 )
@ -103,16 +103,15 @@ DataSpace::DataSpace( const DataSpace& original ) : IdComponent( original ) {}
 //--------------------------------------------------------------------------
 void DataSpace::copy( const DataSpace& like_space )
 {
-   // If this object has a valid id, appropriately decrement reference
-   // counter and close the id.
+   // If this object has an hdf5 valid id, close it
   if( id != H5S_ALL ) {
      try {
-         decRefCount();
+         close();
      }
      catch (Exception close_error) {
         throw DataSpaceIException("DataSpace::copy", close_error.getDetailMsg());
      }
-   }  // if
+   }  // end if

   // call C routine to copy the dataspace
   id = H5Scopy( like_space.getId() );
@ -133,10 +132,13 @@ void DataSpace::copy( const DataSpace& like_space )
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 DataSpace& DataSpace::operator=( const DataSpace& rhs )
+{
+    if (this != &rhs)
    {
 	copy(rhs);
 	return(*this);
    }
+}

 //--------------------------------------------------------------------------
 // Function:	DataSpace::isSimple
@ -553,7 +555,8 @@ void DataSpace::selectHyperslab( H5S_seloper_t op, const hsize_t *count, const h
 //--------------------------------------------------------------------------
 void DataSpace::close()
 {
-   if( id != H5S_ALL ) // not a constant, should call H5Sclose
+    // check if id is a valid hdf5 object id before trying to close it
+    if (p_valid_id(id))
    {
 	herr_t ret_value = H5Sclose(id);
 	if( ret_value < 0 )
@ -563,8 +566,6 @@ void DataSpace::close()
 	// reset the id because the dataspace that it represents is now closed
 	id = 0;
    }
-   else // cannot close a constant
-      throw DataSpaceIException("DataSpace::close", "Cannot close a constant");
 }

 //--------------------------------------------------------------------------
@ -577,16 +578,12 @@ void DataSpace::close()
 //--------------------------------------------------------------------------
 DataSpace::~DataSpace()
 {
-   // If this object has a valid id, appropriately decrement reference
-   // counter and close the id.
-   if( id != H5S_ALL ) {
    try {
-         decRefCount();
+	close();
    }
    catch (Exception close_error) {
 	cerr << "DataSpace::~DataSpace - " << close_error.getDetailMsg() << endl;
    }
-   }  // if
 }

 #ifndef H5_NO_NAMESPACE
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@ -101,18 +101,17 @@ DataType::DataType(const DataType& original) : H5Object(original) {}
 //--------------------------------------------------------------------------
 void DataType::copy( const DataType& like_type )
 {
-    // reset the identifier of this instance, H5Tclose will be called
-    // if needed
+    // If this object is representing an hdf5 object, close it before
+    // copying like_type to it
    try {
-	decRefCount();
+        close();
    }
    catch (Exception close_error) {
-	throw DataTypeIException(inMemFunc("copy"), close_error.getDetailMsg());
+        throw FileIException("DataType::copy", close_error.getDetailMsg());
    }

    // call C routine to copy the datatype
    id = H5Tcopy( like_type.getId() );
-
    if( id < 0 )
 	throw DataTypeIException(inMemFunc("copy"), "H5Tcopy failed");
 }
@ -129,10 +128,13 @@ void DataType::copy( const DataType& like_type )
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 DataType& DataType::operator=( const DataType& rhs )
+{
+    if (this != &rhs)
    {
        copy(rhs);
        return(*this);
    }
+}

 //--------------------------------------------------------------------------
 // Function:	DataType::operator==
@ -635,6 +637,8 @@ DataSpace DataType::getRegion(void *ref, H5R_type_t ref_type) const
 // Programmer	Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
 void DataType::close()
+{
+    if (p_valid_id(id))
    {
 	herr_t ret_value = H5Tclose(id);
 	if( ret_value < 0 )
@ -644,6 +648,7 @@ void DataType::close()
 	// reset the id because the datatype that it represents is now closed
 	id = 0;
    }
+}

 //--------------------------------------------------------------------------
 // Function:	DataType destructor
@ -655,9 +660,8 @@ void DataType::close()
 //--------------------------------------------------------------------------
 DataType::~DataType()
 {
-    // The datatype id will be closed properly
    try {
-	decRefCount();
+	close();
    }
    catch (Exception close_error) {
 	cerr << inMemFunc("~DataType - ") << close_error.getDetailMsg() << endl;
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@ -49,7 +49,7 @@ namespace H5 {
 ///\brief	Default constructor: creates a stub H5File object.
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5File::H5File() : IdComponent() {}
+H5File::H5File() : IdComponent(0) {}

 //--------------------------------------------------------------------------
 // Function:	H5File overloaded constructor
@ -78,7 +78,7 @@ H5File::H5File() : IdComponent() {}
 /// http://hdf.ncsa.uiuc.edu/HDF5/doc/RM_H5F.html#File-Create
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5File::H5File( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : IdComponent()
+H5File::H5File( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : IdComponent(0)
 {
   p_get_file(name, flags, create_plist, access_plist);
 }
@ -96,7 +96,7 @@ H5File::H5File( const char* name, unsigned int flags, const FileCreatPropList& c
 ///		FileCreatPropList::DEFAULT
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5File::H5File( const H5std_string& name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : IdComponent()
+H5File::H5File( const H5std_string& name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ) : IdComponent(0)
 {
   p_get_file(name.c_str(), flags, create_plist, access_plist);
 }
@ -258,7 +258,7 @@ void H5File::reOpen()
   // If this object has a valid id, appropriately decrement reference
   // counter and close the id.
    try {
-        decRefCount();
+        close();
    }
    catch (Exception close_error) {
        throw FileIException("H5File::reOpen", close_error.getDetailMsg());
@ -648,6 +648,8 @@ hid_t H5File::getLocId() const
 // Programmer	Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
 void H5File::close()
+{
+    if (p_valid_id(id))
    {
 	herr_t ret_value = H5Fclose( id );
 	if( ret_value < 0 )
@ -657,6 +659,7 @@ void H5File::close()
 	// reset the id because the file that it represents is now closed
 	id = 0;
    }
+}

 //--------------------------------------------------------------------------
 // Function:	H5File::throwException
@ -689,9 +692,8 @@ void H5File::throwException(const H5std_string func_name, const H5std_string msg
 //--------------------------------------------------------------------------
 H5File::~H5File()
 {
-   // The HDF5 file id will be closed properly
    try {
-        decRefCount();
+	close();
    }
    catch (Exception close_error) {
 	cerr << "H5File::~H5File - " << close_error.getDetailMsg() << endl;
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@ -186,6 +186,8 @@ DataSpace Group::getRegion(void *ref, H5R_type_t ref_type) const
 // Programmer	Binh-Minh Ribler - Mar 9, 2005
 //--------------------------------------------------------------------------
 void Group::close()
+{
+    if (p_valid_id(id))
    {
 	herr_t ret_value = H5Gclose( id );
 	if( ret_value < 0 )
@ -195,6 +197,7 @@ void Group::close()
 	// reset the id because the group that it represents is now closed
 	id = 0;
    }
+}

 //--------------------------------------------------------------------------
 // Function:	Group::throwException
@ -227,14 +230,12 @@ void Group::throwException(const H5std_string func_name, const H5std_string msg)
 //--------------------------------------------------------------------------
 Group::~Group()
 {
-   // The group id will be closed properly
    try {
-        decRefCount();
+	close();
    }
    catch (Exception close_error) {
 	cerr << "Group::~Group - " << close_error.getDetailMsg() << endl;
    }
-
 }

 #ifndef H5_NO_NAMESPACE
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@ -80,6 +80,7 @@ void IdComponent::incRefCount() const
 void IdComponent::decRefCount(const hid_t obj_id) const
 {
    if (p_valid_id(obj_id))
+    {
        if (H5Idec_ref(obj_id) < 0)
 	    if (H5Iget_ref(obj_id) <= 0)
 		throw IdComponentException(inMemFunc("decRefCount"),
@ -88,6 +89,7 @@ void IdComponent::decRefCount(const hid_t obj_id) const
 		throw IdComponentException(inMemFunc("decRefCount"),
 					"decrementing object ref count failed");
    }
+}

 //--------------------------------------------------------------------------
 // Function:	IdComponent::decRefCount
@ -112,7 +114,7 @@ int IdComponent::getCounter(const hid_t obj_id) const
    {
 	counter = H5Iget_ref(obj_id);
 	if (counter < 0)
-            throw IdComponentException(inMemFunc("incRefCount"), "incrementing object ref count failed");
+            throw IdComponentException(inMemFunc("incRefCount"), "getting object ref count failed - negative");
    }
    return (counter);
 }
@ -167,17 +169,24 @@ H5I_type_t IdComponent::getHDFObjType(const hid_t obj_id)
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 IdComponent& IdComponent::operator=( const IdComponent& rhs )
+{
+    if (this != &rhs)
    {
 	// handling references to this id
-   decRefCount();
+	try {
+            close();
+	}
+	catch (Exception close_error) {
+            throw FileIException(inMemFunc("operator="), close_error.getDetailMsg());
+	}

 	// copy the data members from the rhs object
 	id = rhs.id;

 	// increment the reference counter
 	incRefCount();
-
-   return( *this );
+    }
+    return *this;
 }

 //--------------------------------------------------------------------------
@ -194,11 +203,19 @@ IdComponent& IdComponent::operator=( const IdComponent& rhs )
 //--------------------------------------------------------------------------
 void IdComponent::setId(const hid_t new_id)
 {
-   // handling references to this id
-   decRefCount();
+    // handling references to this old id
+    try {
+        close();
+    }
+    catch (Exception close_error) {
+        throw IdComponentException(inMemFunc("copy"), close_error.getDetailMsg());
+    }

   // reset object's id to the given id
   id = new_id;
+
+   // increment the reference counter of the new id
+   incRefCount();
 }

 //--------------------------------------------------------------------------
@ -217,31 +234,7 @@ hid_t IdComponent::getId () const
 ///\brief	Noop destructor.
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-IdComponent::~IdComponent() {
-
-/* uncomment this block and complete it when deciding to use dontAtExit
-   unless the atexit/global destructor problem is fixed, then
-   remove it- BMR 11/14/00
-
-   if( id == NOTATEXIT )
-   {
-      // Call H5Library::close to clean up - temporary solution to avoid the
-      // trouble of atexit/global destructors
-      try {
-         if( H5Library::need_cleanup == true )
-         {
-            H5Library::close();
-            H5Library::need_cleanup = false; // reset the boolean just in case
-         }
-      }
-      // catch failure caused by the H5Library operations
-      catch( LibraryIException error )
-      {
-         error.printError();
-      }
-   }
-*/
-}
+IdComponent::~IdComponent() {}

 //
 // Implementation of protected functions for HDF5 Reference Interface.
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@ -53,7 +53,7 @@ extern "C" herr_t userAttrOpWrpr( hid_t loc_id, const char* attr_name, void* op_
 //		set it to a valid HDF5 id.
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-H5Object::H5Object() : IdComponent() {}
+H5Object::H5Object() : IdComponent(0) {}

 //--------------------------------------------------------------------------
 // Function:	H5Object overloaded constructor (protected)
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@ -236,10 +236,13 @@ const PredType PredType::NATIVE_UINT_LEAST64( H5T_NATIVE_UINT_LEAST64 );
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 PredType& PredType::operator=( const PredType& rhs )
+{
+    if (this != &rhs)
    {
        copy(rhs);
        return(*this);
    }
+}

 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 // These dummy functions do not inherit from DataType - they'll
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@ -97,18 +97,17 @@ PropList::PropList( const hid_t plist_id ) : IdComponent(0)
 //--------------------------------------------------------------------------
 void PropList::copy( const PropList& like_plist )
 {
-    // If this object has a valid id, appropriately decrement reference
-    // counter and close the id.
+    // If this object is representing an hdf5 object, close it before
+    // copying like_plist to it
    try {
-        decRefCount();
+        close();
    }
    catch (Exception close_error) {
-        throw PropListIException(inMemFunc("copy"), close_error.getDetailMsg());
+        throw FileIException("PropList::copy", close_error.getDetailMsg());
    }

    // call C routine to copy the property list
    id = H5Pcopy( like_plist.getId() );
-
    if( id < 0 )
        throw PropListIException(inMemFunc("copy"), "H5Pcopy failed");
 }
@ -125,10 +124,13 @@ void PropList::copy( const PropList& like_plist )
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 PropList& PropList::operator=( const PropList& rhs )
+{
+    if (this != &rhs)
    {
 	copy(rhs);
 	return(*this);
    }
+}

 //--------------------------------------------------------------------------
 // Function:	PropList::copyProp
@ -208,7 +210,7 @@ void PropList::copyProp( PropList& dest, PropList& src, const H5std_string& name
 //--------------------------------------------------------------------------
 void PropList::close()
 {
-   if( id != H5P_NO_CLASS ) // not a constant, should call H5Pclose
+    if (p_valid_id(id))
    {
 	herr_t ret_value = H5Pclose( id );
 	if( ret_value < 0 )
@ -218,8 +220,6 @@ void PropList::close()
 	// reset the id because the property list that it represents is now closed
 	id = 0;
    }
-   else
-      throw PropListIException(inMemFunc("close"), "Cannot close a constant");
 }

 //--------------------------------------------------------------------------
@ -626,9 +626,8 @@ PropList PropList::getClassParent() const
 //--------------------------------------------------------------------------
 PropList::~PropList()
 {
-   // The property list id will be closed properly
    try {
-        decRefCount();
+	close();
    }
    catch (Exception close_error) {
        cerr << "PropList::~PropList - " << close_error.getDetailMsg() << endl;