Changeset 3538

Timestamp:

Mar 29, 2005, 9:21:03 AM (21 years ago)

Author:

eugene

Message:

fits_db cleanups

Location:

trunk/Ohana/src

Files:

• imregister/photreg/args.photreg.c (modified) (1 diff)
• imregister/src/photreg.c (modified) (2 diffs)
• imregister/src/photsearch.c (modified) (2 diffs)
• libohana/doc/glockfile.txt (added)
• libohana/src/fits_db.c (modified) (7 diffs)
• libohana/src/glockfile.c (modified) (4 diffs)

trunk/Ohana/src/imregister/photreg/args.photreg.c

@@ -137 +137 @@
 
 void usage () {  
-  fprintf (stderr, "USAGE: photreg (-zp zp) (-dzp dzp) (-tstart date) (-dt dt) (-photcode code)\n");
+  fprintf (stderr, "USAGE: photreg (-zp zp) (-dzp dzp) (-trange start range|end) (-photcode code)\n");
   fprintf (stderr, "       [-label label] [-offset] [-Nmeas N] [-Ntime N] [-db trans]\n");
   exit (1);

trunk/Ohana/src/imregister/src/photreg.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "photreg.h"
-static char *version = "photreg $Revision: 1.4 $";
+static char *version = "photreg $Revision: 1.5 $";
 
 int main (int argc, char **argv) {
@@ -17 +17 @@
   fits_db_init (&db);
 
-  if (!strcmp (output.db, "phot")) {
-    filename = PhotDB;
-  } else {
-    filename = TransDB;
-  }
+  filename = PhotDB;
+  if (!strcmp (output.db, "trans")) filename = TransDB;
 
-  if (!fits_db_lock (&db, filename)) {
-    fits_db_close (&db);
-    exit (1);
-  }
+  if (!fits_db_lock (&db, filename)) exit (1);
+
   if (db.dbstate == LCK_EMPTY) {
     fits_init_header (&db.header);    

trunk/Ohana/src/imregister/src/photsearch.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "photreg.h"
-static char *version = "photsearch $Revision: 1.4 $";
+static char *version = "photsearch $Revision: 1.5 $";
 
 int main (int argc, char **argv) {
@@ -25 +25 @@
   }
 
-  if (!fits_db_lock (&db, filename)) {
-    fits_db_close (&db);
-    exit (1);
-  }
+  if (!fits_db_lock (&db, filename)) exit (1);
   
   if (!fits_db_load (&db)) {

trunk/Ohana/src/libohana/src/fits_db.c

@@ -16 +16 @@
   /* database name must be set first */
   if (filename == NULL) {
-    fprintf (stderr, "ERROR: db file is not set\n");
+    fprintf (stderr, "db file is not set\n");
     return (FALSE);
   }
@@ -22 +22 @@
   /* database handle must be set first */
   if (db == NULL) {
-    fprintf (stderr, "ERROR: db handle is not set\n");
+    fprintf (stderr, "db handle is not set\n");
     return (FALSE);
   }
@@ -29 +29 @@
   db[0].f = fsetlockfile (filename, db[0].timeout, db[0].lockstate, &db[0].dbstate);
   if (db[0].f == NULL) {
-    fprintf (stderr, "ERROR: cannot set lock on db\n");
+    fprintf (stderr, "cannot set lock on db file %s\n", filename);
     return (FALSE);
   }
@@ -42 +42 @@
   /* database name must be set first */
   if (db == NULL) {
-    fprintf (stderr, "ERROR: db handle is not set\n");
+    fprintf (stderr, "db handle is not set\n");
     return (FALSE);
   }
@@ -48 +48 @@
   /* init & load in FITS table data - return FALSE on error */
   if (!fits_fread_header (db[0].f, &db[0].header)) {
-    fprintf (stderr, "ERROR: can't read primary header\n"); 
+    fprintf (stderr, "can't read primary header\n"); 
     return (FALSE);
   }
   if (!fits_fread_matrix (db[0].f, &db[0].matrix, &db[0].header)) {
-    fprintf (stderr, "ERROR: can't read primary matrix");
+    fprintf (stderr, "can't read primary matrix");
     return (FALSE);
   }
   if (!fits_fread_header (db[0].f, &db[0].theader)) {
-    fprintf (stderr, "ERROR: can't read table header");
+    fprintf (stderr, "can't read table header");
     return (FALSE);
   }
   if (!fits_fread_ftable_data (db[0].f, &db[0].ftable)) {
-    fprintf (stderr, "ERROR: can't read table data");
+    fprintf (stderr, "can't read table data");
     return (FALSE);
   }
@@ -74 +74 @@
 
   if (!fits_fwrite_header  (db[0].f, &db[0].header)) {
-    fprintf (stderr, "ERROR: can't write primary header");
+    fprintf (stderr, "can't write primary header");
     return (FALSE);
   }
   if (!fits_fwrite_matrix  (db[0].f, &db[0].matrix)) {
-    fprintf (stderr, "ERROR: can't write primary matrix");
+    fprintf (stderr, "can't write primary matrix");
     return (FALSE);
   }
   if (!fits_fwrite_Theader (db[0].f, &db[0].theader)) {
-    fprintf (stderr, "ERROR: can't write table header");
+    fprintf (stderr, "can't write table header");
     return (FALSE);
   }
   if (!fits_fwrite_table   (db[0].f, &db[0].ftable)) {
-    fprintf (stderr, "ERROR: can't write table data");
+    fprintf (stderr, "can't write table data");
     return (FALSE);
   }
@@ -103 +103 @@
   /* do we revert to the old version if this fails? */
   if (!fits_fwrite_header   (db[0].f, &db[0].header))  {
-    fprintf (stderr, "ERROR: can't update primary header");
+    fprintf (stderr, "can't update primary header");
     return (FALSE);
   }
   if (!fits_fwrite_matrix   (db[0].f, &db[0].matrix))  {
-    fprintf (stderr, "ERROR: can't update primary matrix");
+    fprintf (stderr, "can't update primary matrix");
     return (FALSE);
   }
   if (!fits_fwrite_Theader  (db[0].f, &db[0].theader)) {
-    fprintf (stderr, "ERROR: can't update table header");
+    fprintf (stderr, "can't update table header");
     return (FALSE);
   }
   if (!fits_fwrite_vtable   (db[0].f, vtable))  {
-    fprintf (stderr, "ERROR: can't update table data");
+    fprintf (stderr, "can't update table data");
     return (FALSE);
   }

trunk/Ohana/src/libohana/src/glockfile.c

@@ -1 +1 @@
 # include <ohana.h>
 
-/* lockfile concepts:
-   
-   set a lockfile on [path]/filename.  
-   we allow three types of locks: 
-   LCK_HARD - exclusive lock with persistent lock file
-   LCK_XCLD - exclusive lock, no persistent lock file
-   LCK_SOFT - shared lock
-
-   both lock types set a filesystem-level lock on the given file, 
-    using exclusive for hard and shared for soft locks
-
-   a hard lock also uses a lockfile to make the lock permanent:
-    the lockfile must be actively removed and will not vanish 
-    even if the locking program dies 
-
-   a soft lock will vanish if the locking program dies.
-
-   if a hard lock is set, both hard & soft locks will block
-   if a soft lock is set, a hard lock will block, but not a soft lock
-
-   the hard lockfile uses the file [path]/.filename.lck
-
-   setlockfile2 returns a file descriptor to an open READ/WRITE access file,
-     or -1 on failure, and sets state.
-*/
-
+/* set a lock on the given file */
 FILE *fsetlockfile (char *filename, double timeout, int type, int *state) {
   
@@ -59 +34 @@
   return (status);
 }
+
+/* should eventually rewrite these two to use a stream as the basic
+   element and only grab the fileno when needed by fcntl
+   (fileno cannot fail) */
 
 int setlockfile2 (char *filename, double timeout, int type, int *state) {
@@ -94 +73 @@
   default:
     fprintf (stderr, "invalid lock type %d\n", type);
+    goto failure;
   }
 
@@ -121 +101 @@
       goto failure;
     }
-    usleep (1000);
+    usleep (10000); /* 10 ms is min */
 
     /* try to lock file */