Changeset 38621

Timestamp:

Jul 22, 2015, 6:04:34 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/relphot/src

Files:

• Shutdown.c (modified) (1 diff)
• reload_catalogs.c (modified) (1 diff)
• relphot.c (modified) (1 diff)
• relphot_client.c (modified) (1 diff)
• relphot_objects.c (modified) (1 diff)
• relphot_synthphot.c (modified) (1 diff)

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

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

branches/eam_branches/ipp-20150625/Ohana/src/relphot/src/reload_catalogs.c

@@ -105 +105 @@
     free (moddate);
 
-    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);
 
     free_tiny_values(&catalog);

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

@@ -4 +4 @@
 
   // get configuration info, args
+  SetSignals ();
   RelphotMode mode = initialize (argc, argv);
   if (!mode) exit (2);

branches/eam_branches/ipp-20150625/Ohana/src/relphot/src/relphot_client.c

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

branches/eam_branches/ipp-20150625/Ohana/src/relphot/src/relphot_objects.c

@@ -101 +101 @@
     // but it would be better to define a dvo crawler program to do this
     // catalog.catformat = DVO_FORMAT_PS1_V1;  
-    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);
     free_tiny_values(&catalog);
     dvo_catalog_free (&catalog);

branches/eam_branches/ipp-20150625/Ohana/src/relphot/src/relphot_synthphot.c

@@ -71 +71 @@
     // but it would be better to define a dvo crawler program to do this
     // catalog.catformat = DVO_FORMAT_PS1_V1;  
-    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);
   }