Changeset 3392 in Sophya for trunk/SophyaLib/HiStats/ntuple.cc

Timestamp:

Nov 22, 2007, 7:25:40 PM (18 years ago)

Author:

ansari

Message:

Implementation NTuple::Fill(), BaseDataTable:;AddRow()/GetRow() thread-safe - Reza 22/11/2007

File:

• trunk/SophyaLib/HiStats/ntuple.cc (modified) (14 diffs)

trunk/SophyaLib/HiStats/ntuple.cc

@@ -5 +5 @@
 #include "perrors.h"
 #include "ntuple.h"
+#include "thsafeop.h"
 
 namespace SOPHYA {
@@ -17 +18 @@
    Simple NTuple class (a Table or 2-D data set) with double or 
    single precision floating point value columns. 
+   \warning 
+   Thread safe fill operation can be activated using the method SetThreadSafe()
+   Default mode is NON thread-safe fill.
    \sa SOPHYA::ObjFileIO<NTuple>
 
@@ -65 +69 @@
 mFgDouble = true;
 mInfo = NULL;
+mThS = NULL; 
 }
 
@@ -89 +94 @@
 mVarD = NULL;
 mInfo = NULL;
+mThS = NULL; 
 if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) "); 
 mNVar = nvar;
@@ -126 +132 @@
 mVarD = NULL;
 mInfo = NULL;
+mThS = NULL; 
 int nvar = noms.size();
 if (nvar <= 0)  throw ParmError("NTuple::NTuple(nvar<=0) "); 
@@ -150 +157 @@
 }
 
-//! Copy constructor - Copies the table definition and associated data 
+/*! 
+  Copy constructor - Copies the table definition and associated data, 
+  as well as the tread safety state
+*/
 //                                       cmv 8/10/99
 //++
@@ -158 +168 @@
 //--
 : mNVar(0), mNEnt(0), mBlk(0), mNBlk(0)
-, mVar(NULL), mVarD(NULL), mInfo(NULL)
+ , mVar(NULL), mVarD(NULL), mInfo(NULL),mThS(NULL)
 {
 if(NT.mNVar<=0) return; // cas ou NT est cree par defaut
@@ -185 +195 @@
 
 if(NT.mInfo!=NULL) {mInfo = new DVList; *mInfo = *(NT.mInfo);}
-
+mThS = NULL; 
+if(NT.mThS!=NULL) SetThreadSafe(true);
 return;
 }
 
-/* --Methode-- 
-//! Constructor with table initialized from a PPF file
-//++
-NTuple::NTuple(char *flnm)
-//
-//      Createur lecture fichier ppersist.
-//--
-{
-mNVar = mNEnt = mBlk = mNBlk = 0;
-mVar = NULL;
-mVarD = NULL;
-mNames = NULL;
-mInfo = NULL;
-PInPersist s(flnm);
-ObjFileIO<NTuple> fiont(this);
-fiont.Read(s);
-}
+
+/* --Methode-- */
+NTuple::~NTuple()
+{
+Clean();
+}
+/* --Methode-- */ 
+/*!
+  \brief Activate or deactivate thread-safe \b Fill() operations
+  If fg==true, create an ThSafeOp object in order to insure atomic Fill()
+  operations. if fg==false, the ThSafeOp object (mThS) of the target NTuple
+  is destroyed. 
+  \warning The default Fill() operation mode for NTuples is NOT thread-safe. 
+  Please note also that the thread-safety state is NOt saved to PPF (or FITS) streams.
 */
-
-/* --Methode-- */
-NTuple::~NTuple()
-{
-Clean();
+void NTuple::SetThreadSafe(bool fg) 
+{
+if (fg) {
+  if (mThS) return;
+  else mThS = new ThSafeOp();
+}
+else {
+  if (mThS) delete mThS;
+  mThS = NULL;
+}
 }
 
@@ -221 +234 @@
 if (mVarD) delete[] mVarD;
 if (mInfo) delete mInfo;
+if (mThS) delete mThS;
 int i;
 if(mNBlk>0) { 
@@ -232 +246 @@
 mVarD = NULL;
 mInfo = NULL;
+mThS = NULL;
 return;
 }
@@ -283 +298 @@
 //--
 {
+if (mThS)  mThS->lock();   // Thread-safe operation 
 int numb = mNEnt/mBlk;
 if (numb >= mNBlk) {
@@ -302 +318 @@
 else memcpy((mPtr[numb]+offb*mNVar), x, mNVar*sizeof(r_4));
 mNEnt++;
+if (mThS)  mThS->unlock();   // Thread-safe operation 
 return;
 }
@@ -316 +333 @@
 //--
 {
+if (mThS)  mThS->lock();   // Thread-safe operation 
 int numb = mNEnt/mBlk;
 if (numb >= mNBlk) {
@@ -337 +355 @@
 
 mNEnt++;
+if (mThS)  mThS->unlock();   // Thread-safe operation 
 return;
 }