Changeset 38626

Timestamp:

Jul 22, 2015, 6:15:27 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

Files:

• fakeastro/src/fakestar_catalog.c (modified) (1 diff)
• getstar/src/write_catalog.c (modified) (1 diff)
• markrock/src/markrock.c (modified) (1 diff)
• markstar/src/markstar.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/fakeastro/src/fakestar_catalog.c

@@ -21 +21 @@
   insert_fakestar (region, stars, Nstars, &catalog);
     
-  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/getstar/src/write_catalog.c

@@ -5 +5 @@
   /* write out the selected stars */
   // XXX need to set the catalog boundaries by hand? RA0-RA1, DEC0-DEC1
-  dvo_catalog_save   (catalog, VERBOSE);
-  dvo_catalog_unlock (catalog);
-  dvo_catalog_free   (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);
   fprintf (stderr, "SUCCESS\n");
   exit (0);

branches/eam_branches/ipp-20150625/Ohana/src/markrock/src/markrock.c

@@ -60 +60 @@
 
   /* rocks2 = find_slow_rocks (&catalog, &catstats, &Nrocks2);  */
-  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/markstar/src/markstar.c

@@ -68 +68 @@
   /* find_ghosts (&catalog, &catstats, argv[1], image, Nimage); */
 
-  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);