Improve memory

Author: dcwhite

src/Core/Matlab/matfile.cc

@@ -742,7 +742,7 @@ void matfile::readtag(matfiledata& md)
       if (type >= miEND) throw unknown_type();
 
       md.clear();
-      md.type(static_cast<mitype>(type));
+      md.setType(static_cast<mitype>(type));
       m_->curptr_.type = static_cast<mitype>(type);
     }
     catch(...)

src/Core/Matlab/matfiledata.cc

@@ -61,81 +61,26 @@ using namespace SCIRun::MatlabIO;
 matfiledata::matfiledata()
     : m_(0), ptr_(0) 
 {
-  m_ = new mxdata;
-  m_->dataptr_ = 0; 
-  m_->owndata_ = false;
-  m_->bytesize_ = 0;
-  m_->type_ = miUNKNOWN;
-  m_->ref_ = 1; 
+  m_.reset(new mxdata);
 }
 
 matfiledata::matfiledata(matfiledata::mitype type)
     : m_(0) , ptr_(0)
 {
-  m_ = new mxdata;
-  m_->dataptr_ = 0; 
-  m_->owndata_ = false;
-  m_->bytesize_ = 0;
+  m_.reset(new mxdata);
   m_->type_ = type;
-  m_->ref_ = 1; 
-}			 
-						 	 	 	 
-matfiledata::~matfiledata()
-{
-  if (m_ != 0)
-  {
-    clearptr();
-  }
 }
 
 void matfiledata::clear()
 {
- if (m_ == 0) 
- {
-   std::cerr << "internal error in clear()\n";
-   throw internal_error();
- }
- if ((m_->dataptr_ != 0)&&(m_->owndata_ == true)) delete[] static_cast<char *>(m_->dataptr_);
- m_->owndata_ = false;
- m_->dataptr_ = 0;	
- m_->bytesize_ = 0;	
- m_->type_ = miUNKNOWN;
-}
-
-void matfiledata::clearptr()
-{
-  if (m_ == 0) return;
-  m_->ref_--;
-  if (m_->ref_ == 0)
-  {
-    clear();
-    delete m_;
-  }
-  m_ = 0;
-  ptr_ = 0;
-}
-
-matfiledata::matfiledata(const matfiledata &mfd)
-{
-	m_ = 0;
-	m_ = mfd.m_;
-	ptr_ = mfd.ptr_;
-  m_->ref_++;
-}
-        
-matfiledata& matfiledata::operator= (const matfiledata &mfd)
-{
-  if (this != &mfd)
+  if (m_ == 0) 
   {
-    clearptr();
-    m_ = mfd.m_;
-    ptr_ = mfd.ptr_;
-    m_->ref_++;
+    std::cerr << "internal error in clear()\n";
+    throw internal_error();
   }
-  return *this;
+  m_.reset(new mxdata);
 }
 
-
 void matfiledata::newdatabuffer(int bytesize,mitype type)
 {
   if (m_ == 0)
@@ -340,7 +285,7 @@ int matfiledata::putstringarray(const std::vector<std::string>& vec)
 
 
 // in case of a void just copy the data (no conversion)
-void matfiledata::getdata(void *dataptr,int dbytesize)
+void matfiledata::getdata(void *dataptr,int dbytesize) const
 {
   if (databuffer() == 0) return;
   if (dataptr  == 0) return;

src/Core/Matlab/matfiledata.h

@@ -79,6 +79,7 @@ DEALINGS IN THE SOFTWARE.
 */
 
 #include <vector>
+#include <boost/shared_ptr.hpp>
 #include <Core/Matlab/matfilebase.h>
 #include <Core/Matlab/share.h>
 
@@ -110,30 +111,25 @@ namespace SCIRun
     private:
       struct mxdata 
       {
+        mxdata() : dataptr_(0), owndata_(false), bytesize_(0), type_(miUNKNOWN) {}
+        ~mxdata() { if (owndata_) delete[] dataptr_; }
         void	*dataptr_;	// Store the data to put in the matfile
         bool	owndata_;   // Do we own the data
         int	bytesize_;	// Size of the data in bytes
         mitype	type_;		// The type of the data
-        int	ref_;		// reference counter
       };    
 
       // data objects	
     private:
-      mxdata *m_;
+      boost::shared_ptr<mxdata> m_;
       void *ptr_;
-      void clearptr();
 
       // functions  
     public:
       matfiledata();
-      ~matfiledata();
+      explicit matfiledata(mitype type);
 
-      matfiledata(mitype type);
-
-      matfiledata(const matfiledata &m); // copy constructor
-      matfiledata& operator= (const matfiledata &m); // assignment
-
-      // clear() will remove any databuffer and emtpty the object
+      // clear() will remove any databuffer and empty the object
       // After calling this function a new buffer can be created
       void clear();
 
@@ -194,13 +190,13 @@ namespace SCIRun
       template<class T> void putandcastvalue(T value,int index);
 
       // string functions	
-      // support functions for reading and writing fieldnames and matrixnames
-      // A struct arrray, can have multiple fields, hence an array of strings
+      // support functions for reading and writing field names and matrix names
+      // A struct array, can have multiple fields, hence an array of strings
       // needs to be read or written. Matlab stores string arrays differently
       // in comparison to a single string, hence the two different types of access
       // functions.
 
-      std::string		 getstring();
+      std::string getstring() const;
       void 			 putstring(const std::string& str);
       std::vector<std::string> getstringarray(int strlength);
       int 			 putstringarray(const std::vector<std::string>&);
@@ -218,19 +214,13 @@ namespace SCIRun
       // This function should be used with care as destroying the object
       // will free the databuffer. A similar effect has clearing or
       // initiating a new buffer. 
-      void *databuffer();
+      void *databuffer() const;
 
       void ptrset(void *ptr);
       void ptrclear();
 
     };
-
-
-    ////////////////////////////////////////
-    ////// TEMPLATE FUNCTIONS///////////////
-    ////////////////////////////////////////
-
-
+    
     template<class T> void matfiledata::getandcast(T *dataptr,int dsize) const
     {
       // This function copies and casts the data in the matfilebuffer into
@@ -290,7 +280,6 @@ namespace SCIRun
       }
     }
 
-
     template<class T> void matfiledata::getandcast(T **dataptr,int dim1, int dim2) const
     {
       // This function copies and casts the data in the matfilebuffer into
@@ -365,7 +354,6 @@ namespace SCIRun
       }
     }
 
-
     template<class T> void matfiledata::getandcast(T ***dataptr,int dim1, int dim2, int dim3) const
     {
       // This function copies and casts the data in the matfilebuffer into
@@ -443,7 +431,6 @@ namespace SCIRun
       }
     }
 
-
     template<class T> void matfiledata::getandcastvector(std::vector<T> &vec) const
     {
 

src/Core/Matlab/matlabfile.cc

@@ -181,7 +181,7 @@ void matlabfile::exportmatlabarray(matlabarray &matrix)
   matfiledata matrixdims;
   matfiledata matrixname;
 
-  matrixheader.type(miMATRIX);
+  matrixheader.setType(miMATRIX);
   writedat(matrixheader);
 
   std::vector<unsigned int> classinfo(2);
@@ -228,7 +228,7 @@ void matlabfile::exportmatlabarray(matlabarray &matrix)
 
   // Create the different tags and data fields
 
-  matrixheader.type(miMATRIX);
+  matrixheader.setType(miMATRIX);
   matrixclass.putandcastvector(classinfo,miUINT32);
   std::vector<int> mdims = matrix.getdims();
   matrixdims.putandcastvector(mdims,miINT32);