Changeset 2282 in Sophya

Timestamp:

Nov 28, 2002, 4:49:21 PM (23 years ago)

Author:

aubourg

Message:

deadlock work

Location:

trunk/ArchTOIPipe

Files:

• Kernel/Makefile.in (modified) (1 diff)
• Kernel/toiprocessor.cc (modified) (3 diffs)
• Kernel/toisegment.cc (modified) (3 diffs)
• Processors/toimedfilter.cc (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/Makefile.in

@@ -56 +56 @@
 SRCFILES = toi.cc toimanager.cc toiprocessor.cc  \
            fitstoirdr.cc fitstoiwtr.cc asciitoiwtr.cc \
-           toisegment.cc toiseqbuff.cc cgt.cc
+           toisegment.cc toiseqbuff.cc cgt.cc \
+           fitsringwtr.cc
 
 FILES=$(patsubst %.c,%.o,$(SRCFILES:.cc=.o))

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiprocessor.cc,v 1.26 2002-09-09 15:33:15 aubourg Exp $
+// $Id: toiprocessor.cc,v 1.27 2002-11-28 15:49:21 aubourg Exp $
 
 #include "toiprocessor.h"
@@ -94 +94 @@
 
 int TOIProcessor::getMinOut() {
-  /*
-  //cout << name << "minout" << endl;
-  if (minOut < 0)  minOut = calcMinOut();
-  //cout << name << "minout=" << minOut << endl;
-  return minOut;
-  */
-  return snBegin + lowExtra;
+  //  return snBegin + lowExtra;
+  return snBegin;
 }
 
 int TOIProcessor::getMaxOut() {
-  /*
-  //cout << name << "maxout" << endl;
-  if (maxOut < 0) maxOut = calcMaxOut();
-  //cout << name << "maxout=" << maxOut << endl;
-  return maxOut;
-  */
-  return snEnd - upExtra;
+  //  return snEnd - upExtra;
+  return snEnd;
 }
 
@@ -122 +112 @@
 
 int TOIProcessor::getMinIn() {
-  /*
-  int nIn = inIx.size();
-  int minIn = 0;
-  for (int i=0; i<nIn; i++) {
-    TOI* toi = inTOIs[i];
-    if (toi == NULL) continue;  // Protection - Reza  13/3/2001
-    int x = toi->getMinSn();
-    if (x > minIn) minIn = x;
-  }
-  if (forcedMinIn > 0 && forcedMinIn > minIn) minIn = forcedMinIn;
-  return minIn;
-  */
-  return snBegin;
+  //  return snBegin;
+  return snBegin - lowExtra;
 }
 
 int TOIProcessor::getMaxIn() {
-  /*
-  int_4 nIn = inIx.size();
-  int_4 maxIn = MAXINT;
-  for (int i=0; i<nIn; i++) {
-    TOI* toi = inTOIs[i];
-    if (toi == NULL) continue;  // Protection - Reza  13/3/2001
-    int_4 x = toi->getMaxSn();
-    if (x < maxIn) maxIn = x;
-  }
-  if (forcedMaxIn > 0 && forcedMaxIn < maxIn) maxIn = forcedMaxIn;
-  return maxIn;
-  */
-  return snEnd;
+  //  return snEnd;
+  return snEnd + upExtra;
 }
 

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.cc,v 1.27 2002-04-16 08:28:53 aubourg Exp $
+// $Id: toisegment.cc,v 1.28 2002-11-28 15:49:21 aubourg Exp $
 
 #include "toisegment.h"
@@ -290 +290 @@
 void  TOISegmented::BufferView::ensure(int sn) { /* Single-thread, reader thread */
   if (sn < sn0) {
-    cout << "TOISegmented::BufferView::ensure requested sample before first" << endl;
+    cout << "TOISegmented::BufferView::ensure : requested sample before first" << endl;
     cout << "sn " << sn << " sn0 " << sn0 << endl;
+    cout << "name : " << master->name << endl;
     abort();
   }
@@ -622 +623 @@
            << endl;
         
-      abort();
+      cout << "lets try something before failing, but the program may block" << endl;
+      pthread_cond_broadcast(&read_wait_condv);
+      //usleep(1000);
+      //      abort();
     }
   }

trunk/ArchTOIPipe/Processors/toimedfilter.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toimedfilter.cc,v 1.3 2002-10-23 21:08:27 aubourg Exp $
+// $Id: toimedfilter.cc,v 1.4 2002-11-28 15:49:21 aubourg Exp $
 
 #include <algorithm>
@@ -33 +33 @@
     int j = i+window-1;
     if (j>=sne) j = sne;
-    //    cout << "median: fetching " << i << " -> " << j << endl;
+    //   cout << "median: fetching " << i << " -> " << j << endl;
     getData(0, i, j-i+1, data);
     for (int ii=i+w/2; ii<=j-w/2; ii++) {
@@ -50 +50 @@
 
 void TOIMedFilter::run() {
+  cout << "TOIMedFilter in : " << getMinIn() << " - " << getMaxIn() 
+       << " out : " << getMinOut() << " - " << getMaxOut() << endl;
   multiset<double> low;  // w/2
   multiset<double> high; // w/2
@@ -70 +72 @@
 
   putData(0, snb+w/2, mid);
-  //  cout << snb+w/2<< " -> " << mid << endl;
+    cout << snb+w/2<< " -> " << mid << endl;
 
   {for (int i=snb+w; i<=sne; i ++) {