Changeset 38619

Timestamp:

Jul 22, 2015, 6:00:04 PM (11 years ago)

Author:

eugene

Message:

protect the catalog I/O layer from signals which can be blocked (ie, allow kill to kill gracefully)

Location:

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src

Files:

• Shutdown.c (modified) (1 diff)
• delete_duplicate_images.c (modified) (1 diff)
• delete_duplicate_measures.c (modified) (1 diff)
• delete_fix_LAP.c (modified) (1 diff)
• delete_fix_LAP_edges_delete.c (modified) (1 diff)
• delete_imagefile.c (modified) (1 diff)
• delete_imagename.c (modified) (1 diff)
• delete_photcodes.c (modified) (1 diff)
• delete_photcodes_single.c (modified) (1 diff)
• delete_times.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/Shutdown.c

@@ -21 +21 @@
   va_end (argp);
 
-  SetProtect (TRUE);
-  if (db) gfits_db_close (db);
   fprintf (stderr, "ERROR: delstar halted\n");
   exit (1);

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_duplicate_images.c

@@ -131 +131 @@
 
     if (UPDATE) {
+      SetProtect (TRUE);
       dvo_catalog_save_complete (&catalog, VERBOSE2);
     }
-
     dvo_catalog_unlock (&catalog);
+    SetProtect (FALSE);
+
     dvo_catalog_free (&catalog);
   }

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_duplicate_measures.c

@@ -70 +70 @@
           exit (1);
         }
+        SetProtect (TRUE);
         dvo_catalog_save_complete (&catalog, VERBOSE2);
       }
     }
-
     dvo_catalog_unlock (&catalog);
+    SetProtect (FALSE);
+
     dvo_catalog_free (&catalog);
   }

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_fix_LAP.c

@@ -68 +68 @@
     int noChange = (NaverageStart == catalog.Naverage) && (NmeasureStart == catalog.Nmeasure);
     if (UPDATE && !noChange) {
+      SetProtect (TRUE);
       dvo_catalog_save_complete (&catalog, VERBOSE2);
     }
-
     dvo_catalog_unlock (&catalog);
+    SetProtect (FALSE);
+
     dvo_catalog_free (&catalog);
   }

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_fix_LAP_edges_delete.c

@@ -118 +118 @@
       // XXX save a backup copy first
       // dvo_catalog_backup (&catalog, TRUE);
+      SetProtect (TRUE);
       dvo_catalog_save_complete (&catalog, VERBOSE2);
     }
-
     dvo_catalog_unlock (&catalog);
+    SetProtect (FALSE);
+
     dvo_catalog_free (&catalog);
   }

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_imagefile.c

@@ -48 +48 @@
     find_matches (&catalog, image[0].photcode, start, stop);
 
-    dvo_catalog_save (&catalog, VERBOSE);
-    dvo_catalog_unlock (&catalog);
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
+    SetProtect (FALSE);
     dvo_catalog_free (&catalog);
   }

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_imagename.c

@@ -62 +62 @@
       find_matches (&catalog, image[j].photcode, start, stop);
 
+      SetProtect (TRUE);
       dvo_catalog_save_complete (&catalog, VERBOSE);
       dvo_catalog_unlock (&catalog);
+      SetProtect (FALSE);
       dvo_catalog_free (&catalog);
     }

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_photcodes.c

@@ -60 +60 @@
 
     delete_photcodes_catalog (&catalog, photcodes, Nphotcodes);
+    SetProtect (TRUE);
     dvo_catalog_save_complete (&catalog, VERBOSE2);
     dvo_catalog_unlock (&catalog);
+    SetProtect (FALSE);
     dvo_catalog_free (&catalog);
   }

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_photcodes_single.c

@@ -28 +28 @@
 
   delete_photcodes_catalog (&catalog, photcodes, Nphotcodes);
+  SetProtect (TRUE);
   dvo_catalog_save_complete (&catalog, VERBOSE2);
   dvo_catalog_unlock (&catalog);
+  SetProtect (FALSE);
   dvo_catalog_free (&catalog);
   return TRUE;

branches/eam_branches/ipp-20150625/Ohana/src/delstar/src/delete_times.c

@@ -77 +77 @@
 
     find_matches (&catalog, code, START, END);
-    dvo_catalog_save (&catalog, VERBOSE);
-    dvo_catalog_unlock (&catalog);
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
+    SetProtect (FALSE);
     dvo_catalog_free (&catalog);
   }