Changeset 1629 in Sophya

Timestamp:

Aug 8, 2001, 12:01:41 PM (24 years ago)

Author:

ansari

Message:

• Ajout pthread_exit apres l'execution de run() ds TOIProcessor::ThreadStart()
• Ajout de la classe ProcSampleCounter<T> pour affichage continu de stats ds toimanager.h .cc
• correction mineure de toi2map.cc
• Utilisation de ProcSampleCounter<T> ds tsttoi2map.cc et simtst.cc

Reza 8/8/2001

Location:

trunk/ArchTOIPipe

Files:

• Kernel/fitstoirdr.cc (modified) (3 diffs)
• Kernel/fitstoirdr.h (modified) (2 diffs)
• Kernel/fitstoiwtr.cc (modified) (2 diffs)
• Kernel/fitstoiwtr.h (modified) (2 diffs)
• Kernel/toimanager.cc (modified) (1 diff)
• Kernel/toimanager.h (modified) (1 diff)
• Kernel/toiprocessor.cc (modified) (1 diff)
• ProcWSophya/toi2map.cc (modified) (1 diff)
• TestPipes/simtst.cc (modified) (3 diffs)
• TestPipes/tsttoi2map.cc (modified) (3 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -11 +11 @@
   name = "rdr";
   fptr = NULL;
+  totnscount = 0;
 }
 
@@ -126 +127 @@
   cout << "reader reading... NRows=" << nrows << " firstSn= " 
        << firstSn << endl;
+
   for (int i=0; i<nrows; i++) {
     int anyNul;
@@ -149 +151 @@
       putData(k, sn, y, flg);
     }
+    totnscount++;
   }
   cout << "reader done reading... " << pthread_self() << endl;

trunk/ArchTOIPipe/Kernel/fitstoirdr.h

@@ -19 +19 @@
 
   virtual void init();  
-  virtual void run();  
+  virtual void run(); 
+ 
+  inline int_8  ProcessedSampleCount() const { return totnscount; }
 
 protected:
@@ -43 +45 @@
   // le flag est alors en colonne+1
 
+  int_8 totnscount;   // Nombre total d'echantillon processe
+
 };
 

trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc

@@ -18 +18 @@
   fits_unlock();
   name = "wtr";
+
+  totnscount = 0;
 }
 
@@ -148 +150 @@
       //           if ((sn%2000 == 0) || (sn<snb+5)) 
       //        cout << " DBG-C-FitsWriter::run()" << sn << " line=" << fitsLine << endl;
-      fitsLine++;
+      fitsLine++;  totnscount++;
     } catch (PException e) {
     cout << "fitstoiwtr exception " << e.Msg() << endl;

trunk/ArchTOIPipe/Kernel/fitstoiwtr.h

@@ -22 +22 @@
   virtual void  addInput(string name, TOI* toi, bool withFlag);
 
-  virtual void  run();  
+  virtual void  run(); 
+ 
+  inline int_8  ProcessedSampleCount() const { return totnscount; }
   
 private:
@@ -32 +34 @@
   map<int,pair<int, bool> > colsinput; // iTOI -> (colonne, hasflag)
   // le flag est alors en colonne+1
+
+  int_8 totnscount;   // Nombre total d'echantillon processe
 };
 

trunk/ArchTOIPipe/Kernel/toimanager.cc

@@ -43 +43 @@
   }
 }
+
+
+// -----------------------------------------------------------------
+//    Classe pour affichage de l'avancement des TOIProcessors 
+//                         Reza 08/2001 
+// -----------------------------------------------------------------
+
+RzProcSampleCounter::RzProcSampleCounter()
+{
+  _msg = "SampleCounter/Info";
+  _rate = 50;
+}
+
+RzProcSampleCounter::~RzProcSampleCounter()
+{
+}
+
+long RzProcSampleCounter::PrintStats()
+{
+  int istart = 0;
+  int iend = 0;
+  long dns_print = 1000;
+  int dns_print_fac = _rate;
+  int nbmax_dns_print = 2;
+
+  TOIManager* mgr = TOIManager::getManager();
+  
+  istart = mgr->getRequestedBegin();
+  iend = mgr->getRequestedEnd();
+  
+  dns_print = (iend-istart)/dns_print_fac;
+  if (dns_print < 1000) dns_print = ((iend-istart) < 1000) ? (iend-istart) : 1000;
+  if (dns_print < 1) dns_print = 1;
+  nbmax_dns_print = (iend-istart)/dns_print;
+
+  cout << "RzProcSampleCounter::PrintStats() InfoMessage=" << _msg 
+       << "\n ... " << _msg << " istart=" 
+       << istart << " iend= " << iend << " dns_print= " << dns_print
+       << " nbmax_dns_print= " << nbmax_dns_print << endl;
+  // ------------------- Impression continu de stat ------------------------ 
+  long nb_dns_print = 0;
+  int nb_sleep = 0;
+  long last_sample_count = 0;
+  long processed_samples = 0;
+  long total_sample_count = dns_print*nbmax_dns_print;
+  bool alldone = false;
+  while (!alldone) {
+    processed_samples = ProcessedSampleCount();
+    if ( (processed_samples-last_sample_count > dns_print) || 
+         (processed_samples > total_sample_count-10) ) {
+      last_sample_count = processed_samples;
+      if (nb_dns_print == 0) cout << "\n";
+      nb_dns_print++;
+      cout << ">>> " << _msg << ": ProcessedSampleCount()= " << last_sample_count 
+           << " Frac done = " << processed_samples*100/total_sample_count << " %" << endl;
+      if (last_sample_count > total_sample_count-10)  alldone = true;
+      nb_sleep = 0;
+    }
+    else if ((nb_sleep+1)%5 == 0) 
+      cout << "> " << _msg << ": ProcSamples()= " <<  processed_samples 
+           << " Done = " << " %" << processed_samples*100/total_sample_count
+           << " NbSleep(1) = " << nb_sleep << endl;
+    
+    sleep(1);  nb_sleep++;
+  }
+  
+  // -----------------------------------------------------------------------
+  
+  return last_sample_count;
+
+}

trunk/ArchTOIPipe/Kernel/toimanager.h

@@ -26 +26 @@
 };
 
+
+// -----------------------------------------------------------------
+//    Classe pour affichage de l'avancement des TOIProcessors 
+//                         Reza 08/2001 
+// -----------------------------------------------------------------
+
+class RzProcSampleCounter {
+public:
+                RzProcSampleCounter();
+  virtual       ~RzProcSampleCounter();
+  virtual long  ProcessedSampleCount() = 0;
+  virtual long  PrintStats();
+  inline int &  PrintRate(int pr) { return _rate; } 
+  inline string& InfoMessage() { return _msg; } 
+protected:
+  int _rate;
+  string _msg;
+};
+
+template <class T>
+class ProcSampleCounter : public RzProcSampleCounter {
+public:
+                ProcSampleCounter(const T & t) { _t = &t; } 
+  virtual long  ProcessedSampleCount()
+                      { return _t->ProcessedSampleCount(); }
+protected:
+  const T * _t;
+};
+
 #endif

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -235 +235 @@
   //  cout << p->name << " new thread running " << pthread_self() << endl;
   p->run();
+  pthread_exit(NULL);
   //  cout << p->name << " thread done " << pthread_self() << endl;
   return NULL;

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -42 +42 @@
 TOI2Map::~TOI2Map()
 {
- if(mWSph && !mWSphInternal) delete mWSph;
+ if(mWSph && mWSphInternal) delete mWSph;
 }
 

trunk/ArchTOIPipe/TestPipes/simtst.cc

@@ -87 +87 @@
   int istart = 0;
   int iend = 0;
-  int_8 dns_print = 1000;
-  int dns_print_fac = 50;
-  int nbmax_dns_print = 2;
 
   double range_min = -16000;
@@ -207 +204 @@
     //  mgr->setRequestedSample(11680920,11710584);
     //  mgr->setRequestedSample(104121000, 104946120);
-    if (fgsetstart) {
+    if (fgsetstart) 
       mgr->setRequestedSample(istart, iend);
-      dns_print = (iend-istart)/dns_print_fac;
-      if (dns_print < 1000) dns_print = 1000;
-      nbmax_dns_print = (iend-istart)/dns_print;
-    }
+
     //    FITSTOIReader r("/data/Archeops/bolo11.fits); 
     FITSTOIReader r(infile); 
@@ -397 +391 @@
 
     // ------------------- Impression continu de stat ------------------------ 
-    int_8 nb_dns_print = 0;
-    int nb_sleep = 0;
-    int_8 last_sample_count = 0;
-    int_8 processed_samples = 0;
-    int_8 total_sample_count = dns_print*nbmax_dns_print;
-    bool alldone = false;
-    while (!alldone) {
-      processed_samples = filt.ProcessedSampleCount();
-      if ( (processed_samples-last_sample_count > dns_print) || 
-           (processed_samples > total_sample_count-10) ) {
-        last_sample_count = processed_samples;
-        if (nb_dns_print == 0) cout << "\n";
-        nb_dns_print++;
-        cout << ">>> simtst/Info: ProcessedSampleCount()= " << last_sample_count 
-             << " Frac done = " << processed_samples*100/total_sample_count << " %" << endl;
-        if (last_sample_count > total_sample_count-10)  alldone = true;
-        nb_sleep = 0;
-      }
-      else if ((nb_sleep+1)%5 == 0) 
-        cout << "> simtst/Info: ProcSamples()= " <<  processed_samples 
-             << " Done = " << " %" << processed_samples*100/total_sample_count
-             << " NbSleep(1) = " << nb_sleep << endl;
-        
-      sleep(1);  nb_sleep++;
-    }
-
+    ProcSampleCounter<SimpleFilter> stats(filt);
+    stats.InfoMessage() = "simtst/Info";
+    stats.PrintStats();
     // -----------------------------------------------------------------------
 

trunk/ArchTOIPipe/TestPipes/tsttoi2map.cc

@@ -154 +154 @@
 //--------------------------------------------------------------------
 
+
  // FITS reader
  FITSTOIReader rfitsb(fitsin_bolo);
@@ -222 +223 @@
    }
 
+ //  Affichage de l'avancement des TOIProcessors 
+ ProcSampleCounter<FITSTOIReader>  stats(rfitsb);
+ stats.InfoMessage() = "tsttoi2map/Info";
+ stats.PrintStats();
+
+ // Fin des traitements des TOIProcessors  
  mgr->joinAll();
  PrtTim("End threads");
+
 
  // Ecriture de la sphere Healpix sur fits
@@ -240 +248 @@
 
  // Nettoyage
+ cout << "tsttoi2map: cleanup " << endl;
  delete sph;
  if(wsph) delete wsph;
+ cout << "tsttoi2map: ----------- End of job -------------- " << endl;
 
 //--------------------------------------------------------------------