Changeset 3392 in Sophya for trunk/SophyaLib/HiStats/swppfdtable.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/swppfdtable.cc (modified) (9 diffs)

trunk/SophyaLib/HiStats/swppfdtable.cc

@@ -1 +1 @@
 #include "swppfdtable.h"
-#include "sopnamsp.h"
 #include "pexceptions.h"
-
+#include "thsafeop.h"
+
+namespace SOPHYA { 
 
 /*!
-   \class SOPHYA::SwPPFDataTable
+   \class SwPPFDataTable
    \ingroup HiStats
    This class can be used to organize data in table (row-column) form.
@@ -96 +97 @@
 }
 
-//! copy constructor - shares the data
+//! copy constructor - shares the data (and copies the thread safety state)
+
 SwPPFDataTable::SwPPFDataTable(SwPPFDataTable const & a)
   : BaseDataTable(a.SegmentSize()),
@@ -137 +139 @@
   // On copie la structure de table 
   CopyStructure(a);
+  if (a.IsThreadSafe())  SetThreadSafe(true);
+  else SetThreadSafe(false);
 
   //
@@ -229 +233 @@
   if (mInfo) delete mInfo;
   mInfo = NULL;
+  if (mThS) delete mThS;
+  mThS = NULL;
   mMin.clear();
   mMax.clear();
@@ -355 +361 @@
   // On est oblige de calculer les min-max lors du remplissage
   // On ne peut pas en effet 'relire' le swap pendant l'ecriture
+  if (mThS) mThS->lock();   // tread-safety
   for(sa_size_t k=0; k<NVar(); k++) {
     double x = data[k];
@@ -361 +368 @@
     mMinMaxNEnt[k]++;
   }
+  if (mThS) mThS->unlock(); // tread-safety
   return BaseDataTable::AddRow(data);
 }
@@ -373 +381 @@
   // On est oblige de calculer les min-max lors du remplissage
   // On ne peut pas en effet 'relire' le swap pendant l'ecriture
+  if (mThS) mThS->lock();   // tread-safety
   for(sa_size_t k=0; k<NVar(); k++) {
     double x = (double)data[k];
@@ -379 +388 @@
     mMinMaxNEnt[k]++;
   }
+  if (mThS) mThS->unlock(); // tread-safety
   return BaseDataTable::AddRow(data);
 }
@@ -394 +404 @@
   return AddRow(data.MTVPtr());
 }
+
+} // FIN namespace SOPHYA