Changeset 3208 in Sophya for trunk/SophyaLib/BaseTools/ndatablock.cc

Timestamp:

Apr 10, 2007, 5:57:02 PM (18 years ago)

Author:

ansari

Message:

Ajout classe ThSafeOp (thsafeop.h) pour rendre NDataBlock<T> (et SegDataBlock) thread-safe, ajout methode DataTypeInfo::getTypeId() , implementation ThSafeOp ds ndatablock.cc (.h), Reza 10/04/2007

File:

• trunk/SophyaLib/BaseTools/ndatablock.cc (modified) (10 diffs)

trunk/SophyaLib/BaseTools/ndatablock.cc

@@ -32 +32 @@
 template <class T> size_t NDataBlock<T>::NallocData       = 0;
 template <class T> size_t NDataBlock<T>::NallocSRef       = 0;
+template <class T> ThSafeOp* NDataBlock<T>::gThsop        = NULL;
 
 //! Set debug (and level print) for allocation and references debug.
@@ -88 +89 @@
 if(Debug_NDataBlock>1)
   cout<<"?_NDataBlock::NDataBlock("<<this<<",n="<<n<<")"<<endl;
+if (gThsop == NULL) gThsop = new ThSafeOp;
 
 Alloc(n, NULL, NULL, fzero);   // allocation et mise a zero
@@ -107 +109 @@
   cout<<"?_NDataBlock::NDataBlock("<<this
       <<",data="<<data<<",br="<<br<<")"<<endl;
+if (gThsop == NULL) gThsop = new ThSafeOp;
 
 Alloc(n,data,br);
@@ -119 +122 @@
 if(Debug_NDataBlock>1)
   cout<<"?_NDataBlock::NDataBlock("<<this<<") default"<<endl;
+if (gThsop == NULL) gThsop = new ThSafeOp;
 }
 
@@ -160 +164 @@
   cout<<"?_NDataBlock::~NDataBlock("<<this<<")"<<endl;
 
-Delete();
+Dealloc();  // ThreadSafe version of Delete()
 }
 
@@ -197 +201 @@
 if(&a==NULL) throw(NullPtrError("NDataBlock::Share  &a==NULL\n"));
 if(!a.mSRef || a.mSz==0) throw(NullPtrError("NDataBlock::Share a.mSz=0\n"));
+//--- Start of atomic (in one block) operation for thread safety 
+gThsop->lock();   //  (ThreadSafe)
 if(mSRef) Delete();
 mSz = a.mSz; mSRef = a.mSRef; mSRef->nref++;
+gThsop->unlock();   //  (ThreadSafe)
+//--- End of atomic operation 
 
 if(Debug_NDataBlock>1)
@@ -330 +338 @@
   throw(NullPtrError("NDataBlock::Alloc br!=NULL && data==NULL\n"));
 if(n==0) throw(SzMismatchError("NDataBlock::Alloc n==0\n"));
+//--- Start of atomic (in one block) operation for thread safety (ThreadSafe)
+gThsop->lock();   //  (ThreadSafe)
 if(mSRef) Delete();
 mSz = n;
@@ -338 +348 @@
 else {mSRef->data = new T[n]; if (zero) memset(mSRef->data,0,n*sizeof(T));}
 mSRef->bridge = br;
+gThsop->unlock();   //  (ThreadSafe)
+//--- End of atomic operation (ThreadSafe)
 
 if(Debug_NDataBlock>0) {
@@ -354 +366 @@
 }
 
-//! Management of de-allocation
+//! Management of de-allocation (NOT thread-safe)
 template <class T>
 void NDataBlock<T>::Delete(void)
@@ -460 +472 @@
 }
 
+/*! 
+  \brief Calls the protected Delete() method to set the size to zero
+  This is the public - thread safe version - of the Delete() method
+  The memory is freed if last referenced structure. 
+*/
+template <class T>
+void NDataBlock<T>::Dealloc()
+{
+  gThsop->lock();
+  Delete();
+  gThsop->unlock();
+}
+
 ////////////////
 // Impression //