Changeset 1743 in Sophya for trunk/ArchTOIPipe/Kernel/toisegment.cc

Timestamp:

Nov 10, 2001, 12:14:28 AM (24 years ago)

Author:

aubourg

Message:

optim lecture/ecriture en bloc

File:

• trunk/ArchTOIPipe/Kernel/toisegment.cc (modified) (7 diffs)

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.cc,v 1.15 2001-11-08 23:23:58 aubourg Exp $
+// $Id: toisegment.cc,v 1.16 2001-11-09 23:13:15 aubourg Exp $
 
 #include "toisegment.h"
@@ -67 +67 @@
 }
 
+void TOISegmented::getData(int i, int n, double* data, uint_8* flg) { /* reader thread */
+  master->getData(i, n, data, flg);
+}
+
 void TOISegmented::putData(int i, double value, uint_8 flag) { /* writer thread */
   master->putData(i, value, flag);
+}
+
+void TOISegmented::putData(int i, int n, double const* val, uint_8 const* flg) { /* writer thread */
+  master->putData(i, n, val, flg);
 }
 
@@ -152 +160 @@
   delete[] flags;
   pthread_mutex_destroy(&refcount_mutex);
+}
+
+void TOISegmented::BufferSegment::getData(int sn, int n, double* d, uint_8* f) {
+  checkCommitted();
+  checkInRange(sn);
+  checkInRange(sn+n-1);
+  memcpy(d, data+(sn-sn0), n*sizeof(double));
+  if (f != NULL) {
+    memcpy(f, flags+(sn-sn0), n*sizeof(uint_8));
+  }
 }
 
@@ -166 +184 @@
   data[sn-sn0] = d;
   flags[sn-sn0] = f;
+}
+
+void TOISegmented::BufferSegment::putData(int sn, int n, double const* d, uint_8 const* f) {
+  checkCommitted();
+  checkInRange(sn);
+  checkInRange(sn+n-1);
+  memcpy(data+(sn-sn0), d, n*sizeof(double));
+  if (f != NULL) {
+    memcpy(flags+(sn-sn0), f, n*sizeof(uint_8));
+  } else {
+    memset(flags+(sn-sn0), 0, n*sizeof(uint_8));
+  }
 }
 
@@ -215 +245 @@
   int seg = (sn-sn0)/segmentSize;
   return segments[seg]->getFlag(sn);
+}
+
+void TOISegmented::BufferView::getData(int sn, int n, double* dat, uint_8* flg) { /* Single-thread, reader thread */
+  ensure(sn);
+  ensure(sn+n-1);
+  
+  int  sn1  = sn;
+  int  nsam = n;
+  double* pdat = dat;
+  uint_8* pflg = flg;
+
+  while (true) {
+    int seg = (sn1-sn0)/segmentSize;
+    BufferSegment* s = segments[seg];
+    int snmax = s->sn0 + s->bufferSize - 1;
+    int sn2 = snmax > (sn1+nsam-1) ? (sn1+nsam-1) : snmax;
+    int nget = sn2-sn1+1;
+    s->getData(sn1, nget, pdat, pflg);
+    pdat += nget;
+    if (pflg != NULL) pflg += nget;
+    nsam -= nget;
+    sn1  += nget;
+    if (nsam <= 0) break;
+  }
 }
 
@@ -324 +378 @@
 }
 
+void TOISegmented::MasterView::putData(int sn, int n, double const* data, uint_8 const* flags) { /* writer thread */
+  if (sn0<0) {
+    LOG(cout << "***MasterView::putData sn0<0" << endl);
+    sn0=sn;
+  }
+  double const*  pdat = data;
+  uint_8 const*  pflg = flags;
+  int     nsam  = n;
+  int     sn1   = sn;
+  while (true) {
+    // maximum that current segment can take
+    int snmax = -1;
+    if (currentSegment != NULL) {
+      snmax = currentSegment->sn0 + currentSegment->bufferSize-1;
+    }
+    int sn2 = snmax > (sn1+nsam-1) ? (sn1+nsam-1) : snmax;
+    if (snmax>0) {
+      int nput = sn2-sn1+1;
+      currentSegment->putData(sn1, nput, pdat, pflg);
+      pdat += nput;
+      if (pflg != NULL) pflg += nput;
+      nsam -= nput;
+      sn1  += nput;
+    }
+    if (nsam <= 0) break;
+    nextSegment();
+    currentSegment->putData(sn1, 0, 0); // dummy, to initialize sn0 in segment : add method ?
+  }
+}
+
 double TOISegmented::MasterView::getData(int sn) { /* reader thread */
   return getView()->getData(sn); /* thread-specific */
@@ -330 +414 @@
 uint_8 TOISegmented::MasterView::getFlag(int sn) { /* reader thread */
   return getView()->getFlag(sn);
+}
+
+void TOISegmented::MasterView::getData(int sn, int n, double* dat, uint_8* flg) { /* reader thread */
+  getView()->getData(sn, n, dat, flg);
 }