Changeset 38620

Timestamp:

Jul 22, 2015, 6:02:43 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/relastro/src

Files:

• Shutdown.c (modified) (1 diff)
• high_speed_objects.c (modified) (1 diff)
• hpm_objects.c (modified) (1 diff)
• relastro.c (modified) (1 diff)
• relastro_client.c (modified) (1 diff)
• relastro_merge_source.c (modified) (1 diff)
• save_catalogs.c (modified) (1 diff)

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

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

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/high_speed_objects.c

@@ -270 +270 @@
 
   fprintf (stderr, "found %d matches\n", Nmatch);
-  dvo_catalog_save (&catalogOut, VERBOSE2);
-  dvo_catalog_unlock (&catalogOut);
+
+  SetProtect (TRUE);
+  if (!dvo_catalog_save (&catalogOut, VERBOSE2)) { fprintf (stderr, "ERROR: failed to save %s\n", catalogOut.filename); exit (1); }
+  if (!dvo_catalog_unlock (&catalogOut)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalogOut.filename); exit (1); }
+  SetProtect (FALSE);
+
   dvo_catalog_free (&catalogOut);
   free (slowMoving);

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/hpm_objects.c

@@ -110 +110 @@
   if (catalog[0].Naverage == Nslow) {
     fprintf (stderr, "no possible fast objects, skipping this catalog\n");
-    dvo_catalog_save (&catalogOut, VERBOSE2);
-    dvo_catalog_unlock (&catalogOut);
+
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalogOut, VERBOSE2)) { fprintf (stderr, "ERROR: failed to save %s\n", catalogOut.filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalogOut)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalogOut.filename); exit (1); }
+    SetProtect (FALSE);
+
     dvo_catalog_free (&catalogOut);
     free (slowMoving);

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

@@ -4 +4 @@
 
   /* get configuration info, args */
+  SetSignals ();
   initialize (argc, argv);
 

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/relastro_client.c

@@ -22 +22 @@
 
   // get configuration info, args, lockfile (set CATDIR, HOST_ID, HOSTDIR, etc) 
+  SetSignals ();
   initialize_client (argc, argv);
 

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/relastro_merge_source.c

@@ -122 +122 @@
     resort_catalog (&catalog_src);
 
-    dvo_catalog_save (&catalog_src, VERBOSE2);
-    dvo_catalog_unlock (&catalog_src);
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalog_src, VERBOSE2)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog_src.filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalog_src)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog_src.filename); exit (1); }
+    SetProtect (FALSE);
     dvo_catalog_free (&catalog_src);
 

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/save_catalogs.c

@@ -9 +9 @@
 
     if (VERBOSE2) fprintf (stderr, "saving catalog %s\n", catalog[i].filename);
-    dvo_catalog_save (&catalog[i], VERBOSE2); 
-    dvo_catalog_unlock (&catalog[i]);
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalog[i], VERBOSE2)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog[i].filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalog[i])) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog[i].filename); exit (1); }
+    SetProtect (FALSE);
     dvo_catalog_free (&catalog[i]);
   }