Changeset 20535 for trunk/Ohana/src/opihi/dvo/pmeasure.c

Timestamp:

Nov 4, 2008, 4:29:47 PM (18 years ago)

Author:

eugene

Message:

add interrupts to (potentially) long loops

File:

• trunk/Ohana/src/opihi/dvo/pmeasure.c (modified) (6 diffs)

trunk/Ohana/src/opihi/dvo/pmeasure.c

@@ -7 +7 @@
   
   FILE *f;
-  int i, j, k, m, kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect;
+  int i, j, k, m, kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded;
   double Mz, Mr, mag;
   double Radius, Rmin, Rmax, R, D, trange;
@@ -16 +16 @@
   float *Xvec, *Yvec, *Zvec;
   time_t tzero, tend;
+  void *Signal;
 
   SkyTable *sky;
@@ -172 +173 @@
   ALLOCATE (Zvec, float, NPTS);
 
-  for (j = 0; j < skylist[0].Nregions; j++) {
+  // prepare to handle interrupt signals
+  Signal = signal (SIGINT, handle_interrupt);
+  interrupt = FALSE;
+
+  Nloaded = 0;
+  for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
     catalog.filename = skylist[0].filename[j];
     catalog.catflags = LOAD_AVES | LOAD_MEAS;
@@ -185 +191 @@
 
     /* project stars to screen display coords */
-    for (i = 0; i < catalog.Naverage; i++) {
+    for (i = 0; (i < catalog.Naverage) && !interrupt; i++) {
       if (IDclip && (catalog.average[i].code != IDchoice)) continue;
       catalog.average[i].R = ohana_normalize_angle (catalog.average[i].R);
@@ -213 +219 @@
         }
         status = fRD_to_XY (&Xvec[Npts], &Yvec[Npts], R, D, &graphmode.coords);
-        if (!status) {
-          fprintf (stderr, ".");
-          continue;
-        }
+        if (!status) continue;
         Npts ++;
 
@@ -225 +228 @@
             REALLOCATE (Zvec, float, NPTS);
         }
-        if (Npts > NCHUNK) {
+        if ((Npts > NCHUNK) || (Nloaded >= 25)) {
             PlotVectorTriplet (kapa, Npts, Xvec, Yvec, Zvec, &graphmode);
             Npts = 0;
+            Nloaded = 0;
         }
       }
     }
+    Nloaded ++;
     dvo_catalog_free (&catalog);
   }