Changeset 1710 in Sophya for trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

Timestamp:

Oct 19, 2001, 2:20:38 PM (24 years ago)

Author:

aubourg

Message:

pb deadlock multiple fits readers

File:

• trunk/ArchTOIPipe/Kernel/fitstoirdr.cc (modified) (3 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -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();
+      fits_unlock();
       putData(k, sn, y, flg);
     }
-    if (i%50==0)  {
+/*    if (i%50==0)  {
       fits_unlock();
       sched_yield();
       fits_lock();
-    }
+    }*/
     totnscount++;
   }
-  fits_unlock();
+  //fits_unlock();
   cout << "reader done reading... " << pthread_self() << endl;
 }