Changeset 3391 in Sophya for trunk/SophyaExt

Timestamp:

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

Author:

ansari

Message:

Adaptation a ThSafeOp (thread-safety) pour BaseDataTable, Reza 22/11/2007

File:

• trunk/SophyaExt/FitsIOServer/swfitsdtable.cc (modified) (9 diffs)

trunk/SophyaExt/FitsIOServer/swfitsdtable.cc

@@ -1 +1 @@
 #include "swfitsdtable.h"
 #include "fitshdtable.h"
-#include "sopnamsp.h"
 #include "pexceptions.h"
-
+#include "thsafeop.h"
+
+namespace SOPHYA { 
 
 /*!
-   \class SOPHYA::SwFitsDataTable
+   \class SwFitsDataTable
    \ingroup FitsIOServer
    This class can be used to organize data in table (row-column) form.
@@ -101 +102 @@
 }
 
-//! copy constructor - shares the data
+//! copy constructor - shares the data (and copies the thread safety state)
 SwFitsDataTable::SwFitsDataTable(SwFitsDataTable const & a)
   : BaseDataTable(a.SegmentSize()),
@@ -130 +131 @@
   // On copie la structure de table 
   CopyStructure(a);
+  if (a.IsThreadSafe())  SetThreadSafe(true);
+  else SetThreadSafe(false);
 
   //
@@ -223 +226 @@
   if (mInfo) delete mInfo;
   mInfo = NULL;
+  if (mThS) delete mThS;
+  mThS = NULL;
+
   mMin.clear();
   mMax.clear();
@@ -403 +409 @@
 sa_size_t SwFitsDataTable::AddRow(const r_8* data)
 {
+  if (mThS) mThS->lock();   // tread-safety
   if (NRows() == 0) {  // On cree la definition de la table FITS au premier appel
     FitsHandler<BaseDataTable> fio(*this);
@@ -415 +422 @@
     mMinMaxNEnt[k]++;
   }
+  if (mThS) mThS->unlock(); // tread-safety
   return BaseDataTable::AddRow(data);
 }
@@ -426 +434 @@
 sa_size_t SwFitsDataTable::AddRow(const MuTyV * data)
 {
+  if (mThS) mThS->lock();   // tread-safety
   if (NRows() == 0) {  // On cree la definition de la table FITS au premier appel
     FitsHandler<BaseDataTable> fio(*this);
@@ -438 +447 @@
     mMinMaxNEnt[k]++;
   }
+  if (mThS) mThS->unlock();   // tread-safety
   return BaseDataTable::AddRow(data);
 }
@@ -453 +463 @@
   return AddRow(data.MTVPtr());
 }
+
+} // FIN namespace SOPHYA