Changeset 1696 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

Oct 15, 2001, 12:44:49 AM (24 years ago)

Author:

aubourg

Message:

optim locks fits

Location:

trunk/ArchTOIPipe/Kernel

Files:

• fitstoirdr.cc (modified) (4 diffs)
• fitstoiwtr.cc (modified) (3 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -1 +1 @@
 #include "fitstoirdr.h"
 #include "toimanager.h"
-
+#include <sched.h>
 
 
@@ -128 +128 @@
        << firstSn << endl;
 
+  fits_lock();
   for (int i=0; i<nrows; i++) {
     int anyNul;
     double y;
-    fits_lock();
     fits_read_col_dbl(fptr,1,i+1,1,1,0,&y,&anyNul,&fstatus);
-    fits_unlock();
+    //fits_unlock();
     int sn = (int) (y+.1);
     TOIManager* mgr = TOIManager::getManager();
@@ -142 +142 @@
       int j = colsinput[k].first;
       if ( !checkOutputTOIIndex(k) )  continue;  // Reza - Si TOI non connecte
-      fits_lock();
+      //      fits_lock();
       fits_read_col_dbl(fptr,j+1,i+1,1,1,0,&y,&anyNul,&fstatus);
       long flg = 0;
@@ -148 +148 @@
         fits_read_col_lng(fptr,j+2,i+1,1,1,0,&flg,&anyNul,&fstatus);
       }
+      //      fits_unlock();
+      putData(k, sn, y, flg);
+    }
+    if (i%50==0)  {
       fits_unlock();
-      putData(k, sn, y, flg);
+      sched_yield();
+      fits_lock();
     }
     totnscount++;
   }
+  fits_unlock();
   cout << "reader done reading... " << pthread_self() << endl;
 }

trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc

@@ -1 +1 @@
 #include "fitstoiwtr.h"
 #include "toimanager.h"
-
+#include <sched.h>
 
 
@@ -131 +131 @@
       }
       wontNeedBefore(sn);
-      fits_lock();
       //      if ((sn%2000 == 0) || (sn<snb+5)) 
       //cout << " DBG-B-FitsWriter::run()" << sn << endl;
       double xx = sn;
+      fits_lock();
       fits_write_col_dbl(fptr, 1, fitsLine, 1, 1, &xx, &fstatus);
       
@@ -150 +150 @@
       }
       fits_unlock();
+      if (fitsLine%50==0) {
+        sched_yield();
+      }
       //           if ((sn%2000 == 0) || (sn<snb+5)) 
       //        cout << " DBG-C-FitsWriter::run()" << sn << " line=" << fitsLine << endl;