Changeset 1750 in Sophya

Timestamp:

Nov 12, 2001, 3:12:54 PM (24 years ago)

Author:

aubourg

Message:

bug i/o bloc avec requested sample

Location:

trunk/ArchTOIPipe/Kernel

Files:

• fitstoirdr.cc (modified) (3 diffs)
• toiprocessor.cc (modified) (2 diffs)
• toisegment.cc (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.18 2001-11-10 00:14:54 aubourg Exp $
+// $Id: fitstoirdr.cc,v 1.19 2001-11-12 14:12:54 aubourg Exp $
 
 #include "fitstoirdr.h"
@@ -252 +252 @@
    long sn = (long) (samplenum[ip]+.1);
    TOIManager* mgr = TOIManager::getManager();
+#if 0
    if(sn > mgr->getRequestedEnd()) break;
    if(sn < mgr->getRequestedBegin()) continue;
-#if 0
    for(int k=0; k<getNOut(); k++) {
      if(colval[k]==NULL)  continue;
@@ -261 +261 @@
    }
 #else
+   if(ideb > mgr->getRequestedEnd()) break;
+   if(ifin < mgr->getRequestedBegin()) continue;
    if (ip == 0) { 
      for(int k=0; k<getNOut(); k++) {

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiprocessor.cc,v 1.16 2001-11-09 23:14:28 aubourg Exp $
+// $Id: toiprocessor.cc,v 1.17 2001-11-12 14:12:54 aubourg Exp $
 
 #include "toiprocessor.h"
@@ -375 +375 @@
   if (iCur < lastAWN + neededHistory) return;
   lastAWN = iCur;
-  //cout << name << " wontNeedBefore "  << iCur-neededHistory << endl;
+  // cout << name << " wontNeedBefore "  << iCur-neededHistory << endl;
   wontNeedBefore(iCur-neededHistory);
 }

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.cc,v 1.17 2001-11-10 00:14:55 aubourg Exp $
+// $Id: toisegment.cc,v 1.18 2001-11-12 14:12:54 aubourg Exp $
 
 #include "toisegment.h"
@@ -279 +279 @@
 void  TOISegmented::BufferView::ensure(int sn) { /* Single-thread, reader thread */
   if (sn < sn0) {
-    LOG(cout << "TOISegmented::BufferView::ensure requested sample before first" << endl);
-    LOG(cout << "sn " << sn << " sn0 " << sn0 << endl);
+    cout << "TOISegmented::BufferView::ensure requested sample before first" << endl;
+    cout << "sn " << sn << " sn0 " << sn0 << endl;
     abort();
   }
@@ -371 +371 @@
 void TOISegmented::MasterView::putData(int sn, double data, uint_8 flags) { /* writer thread */
   if (sn0<0) {
-    LOG(cout << "***MasterView::putData sn0<0" << endl)
+    LOG(cout << "***MasterView::putData sn0<0 -> " << sn << endl);
     sn0=sn;
   }
@@ -386 +386 @@
 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);
+    LOG(cout << "***MasterView::putData sn0<0 -> " << sn << endl);
     sn0=sn;
   }