Changeset 1702 in Sophya

Timestamp:

Oct 15, 2001, 11:32:28 PM (24 years ago)

Author:

aubourg

Message:

re-correction du bug getMaxIn

Location:

trunk/ArchTOIPipe

Files:

• Kernel/toimanager.cc (modified) (4 diffs)
• Kernel/toimanager.h (modified) (5 diffs)
• Makefile.in (modified) (1 diff)
• ProcWSophya/Makefile.in (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/toimanager.cc

@@ -1 +1 @@
 #include "toimanager.h"
-#include <unistd.h>
 #include <limits.h>
 #include <pthread.h>
 #include <iostream.h>
 
+#ifndef MAXINT
+#define MAXINT 2147483647
+#endif
+
 TOIManager::TOIManager() {
   reqBegin = 0;
-  reqEnd = LONG_MAX;
+  reqEnd = MAXINT;
 }
 
@@ -17 +20 @@
 }
 
-void TOIManager::setRequestedSample(long begin, long end) {
+void TOIManager::setRequestedSample(int begin, int end) {
   reqBegin = begin;
   reqEnd   = end;
 }
 
-long TOIManager::getRequestedBegin() {
+int TOIManager::getRequestedBegin() {
   return reqBegin;
 }
 
-long TOIManager::getRequestedEnd() {
+int TOIManager::getRequestedEnd() {
   return reqEnd;
 }
@@ -93 +96 @@
     processed_samples = ProcessedSampleCount();
     if ( (processed_samples-last_sample_count > dns_print) || 
-         (processed_samples > total_sample_count-10) ) {
+         (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;
+           << " Frac done = " << processed_samples*100/total_sample_count << " %" << endl;
       if (last_sample_count > total_sample_count-10)  alldone = true;
       nb_sleep = 0;
@@ -104 +107 @@
     else if ((nb_sleep+1)%5 == 0) 
       cout << "> " << _msg << ": ProcSamples()= " <<  processed_samples 
-           << " Done = " << " %" << processed_samples*100/total_sample_count
-           << " NbSleep(1) = " << nb_sleep << endl;
+           << " Done = " << " %" << processed_samples*100/total_sample_count
+           << " NbSleep(1) = " << nb_sleep << endl;
     
     sleep(1);  nb_sleep++;

trunk/ArchTOIPipe/Kernel/toimanager.h

@@ -12 +12 @@
 public:
   static TOIManager* getManager();
-  void setRequestedSample(long begin, long end);
-  long getRequestedBegin();
-  long getRequestedEnd();
+  void setRequestedSample(int begin, int end);
+  int getRequestedBegin();
+  int getRequestedEnd();
   void addThread(pthread_t*);
   void joinAll();
@@ -27 +27 @@
 };
 
-
 // -----------------------------------------------------------------
 //    Classe pour affichage de l'avancement des TOIProcessors 
@@ -35 +34 @@
 class RzProcSampleCounter {
 public:
-                RzProcSampleCounter();
+  RzProcSampleCounter();
   virtual       ~RzProcSampleCounter();
-  virtual long  ProcessedSampleCount() = 0;
+  virtual long  ProcessedSampleCount() = 0;
   virtual long  PrintStats();
   inline int &  PrintRate(int pr) { return _rate; } 
@@ -49 +48 @@
 class ProcSampleCounter : public RzProcSampleCounter {
 public:
-                ProcSampleCounter(const T & t) { _t = &t; } 
-  virtual long  ProcessedSampleCount()
-                      { return _t->ProcessedSampleCount(); }
+  ProcSampleCounter(const T & t) { _t = &t; } 
+  virtual long  ProcessedSampleCount()
+  { return _t->ProcessedSampleCount(); }
 protected:
   const T * _t;
@@ -57 +56 @@
 
 #endif
+

trunk/ArchTOIPipe/Makefile.in

@@ -71 +71 @@
           if [ -d $$d ]; then \
             cd $$d; $(MAKE) clean; \
+            cd ..; \
           fi  \
         done

trunk/ArchTOIPipe/ProcWSophya/Makefile.in

@@ -80 +80 @@
 libatsop.a: $(FILES)
         $(AR) -cr libatsop.a $(FILES) 
-        ranlib libatkern.a
+        ranlib libatsop.a
         ln -f libatsop.a ../libatsop.a