Changeset 38623

Timestamp:

Jul 22, 2015, 6:13:33 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/photdbc

Files:

• Makefile (modified) (2 diffs)
• src/Shutdown_dvodist.c (modified) (1 diff)
• src/photdbc.c (modified) (1 diff)
• src/photdbc_catalogs.c (modified) (1 diff)
• src/photdbc_client.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/photdbc/Makefile

@@ -27 +27 @@
 $(SRC)/photdbc.$(ARCH).o           \
 $(SRC)/photdbc_catalogs.$(ARCH).o  \
+$(SRC)/SetSignals.$(ARCH).o        \
 $(SRC)/initialize.$(ARCH).o        \
 $(SRC)/ConfigInit.$(ARCH).o        \
@@ -39 +40 @@
 $(SRC)/photdbc_client.$(ARCH).o    \
 $(SRC)/photdbc_catalogs.$(ARCH).o  \
+$(SRC)/SetSignals.$(ARCH).o        \
 $(SRC)/initialize.$(ARCH).o        \
 $(SRC)/ConfigInit.$(ARCH).o        \

branches/eam_branches/ipp-20150625/Ohana/src/photdbc/src/Shutdown_dvodist.c

@@ -43 +43 @@
   va_end (argp);
 
-  // XXX this is in SetSignals.c, which includes photdbc.h
-  SetProtect (TRUE);
-  gfits_db_close (&db);
   fprintf (stderr, "ERROR: dvodist halted\n");
   exit (1);

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

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

branches/eam_branches/ipp-20150625/Ohana/src/photdbc/src/photdbc_catalogs.c

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

branches/eam_branches/ipp-20150625/Ohana/src/photdbc/src/photdbc_client.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
+  SetSignals ();
   initialize_client (argc, argv);