Changeset 2863 in Sophya for trunk

Timestamp:

Jan 2, 2006, 2:38:54 PM (20 years ago)

Author:

ansari

Message:

Correction bug latent ds SwSegDataBlock<T> (operateur = et constructeur de copie) par ajout / appel methode Clone() dans DataSwapperInterface<T> - Reza 2 Jan 2006

Location:

trunk/SophyaLib/BaseTools

Files:

• ppfswapper.h (modified) (2 diffs)
• swsegdb.h (modified) (6 diffs)

trunk/SophyaLib/BaseTools/ppfswapper.h

@@ -43 +43 @@
   virtual int_8 WriteToSwap(const T * d, size_t sz, int_8 idx, int_8 oswp=0, bool osw=false)
   {
-    if (ppfos == NULL) throw NotAvailableOperation("PPFDataSwapper<T>::WriteToSwap() - No POutPersist stream !");
+    if (ppfos == NULL) 
+      throw NotAvailableOperation("PPFDataSwapper<T>::WriteToSwap() - No POutPersist stream !");
     int_8 tag = ppfos->WritePositionTag();
     PPF_TPointer_IO<T>::Write(*ppfos, d, sz);
@@ -50 +51 @@
   virtual void  ReadFromSwap(int_8 idx, int_8 swp, T* d, size_t sz)
   {
-    if (ppfis == NULL) throw NotAvailableOperation("PPFDataSwapper<T>::ReadFromSwap() - No PInPersist stream !");
+    if (ppfis == NULL) 
+      throw NotAvailableOperation("PPFDataSwapper<T>::ReadFromSwap() - No PInPersist stream !");
     bool ok = ppfis->GotoPositionTag(swp);
     PPF_TPointer_IO<T>::Read(*ppfis, d, sz);
     return;
+  }
+  virtual DataSwapperInterface<T>* Clone()
+  {
+    PPFDataSwapper<T> * rsw = new PPFDataSwapper<T> ;
+    (*rsw) = *this; 
+    return rsw;
   }
 protected:

trunk/SophyaLib/BaseTools/swsegdb.h

@@ -52 +52 @@
    */
   virtual void  ReadFromSwap(int_8 idx, int_8 swp, T* d, size_t sz) = 0;
+
+  /*! Duplicate the swapper object and return the new object pointer.
+      The returned pointer should be deleted when not needed any more.
+      This method is used by SwSegDataBlock<T> 
+  */
+  virtual DataSwapperInterface<T>* Clone() = 0;
 };
 
@@ -62 +68 @@
     mSRef = NULL;
     SetSize(segsz, swpos.size());
-    mSRef->swapper = &dsw;
+    SetSwapper(dsw);
     mSRef->swp = swpos;
     for(size_t k=0; k<mSRef->fgwp.size(); k++)  mSRef->fgwp[k] = true; 
@@ -71 +77 @@
     mSRef = NULL;
     SetSize(segsz, nbseg);
-    mSRef->swapper = &dsw;
+    SetSwapper(dsw);
   }
   //! copy constructor - shares the data
@@ -89 +95 @@
     return mSRef->swp.size();
   }
-  //! Changes the data segment size and reallocates the memory segments
+  /*! \brief Changes the data segment size and reallocates the memory segments
+    \warning SetSwapper() must be called after call to SetSize() 
+  */
   // segsz : Segment size ;  nbseg : Number of data segments
   virtual void SetSize(size_t segsz, size_t nbseg=0)
@@ -105 +113 @@
       mSRef->fgwp.push_back(false);
     }
-  }
+    mSRef->swapper = NULL;
+  }
+
+  //! Define the data swapper object. Should only be called if SetSize() is called
+  void SetSwapper(DataSwapperInterface<T> & dsw)
+  {
+    if (mSRef == NULL) return;
+    if (mSRef->swapper) delete mSRef->swapper;  
+    mSRef->swapper = dsw.Clone();
+  }
+
   //! Return the segment size data structure
   virtual  size_t SegmentSize() const  { return mSRef->segsize; }
@@ -165 +183 @@
     mSRef->nref--;
     if (mSRef->nref > 0)  { mSRef = NULL; return; }
+    if (mSRef->swapper) delete mSRef->swapper;  
     delete[] mSRef->buff;
     delete mSRef;