Changeset 33207

Timestamp:

Feb 7, 2012, 11:48:36 AM (14 years ago)

Author:

eugene

Message:

working on dvodist

Location:

branches/eam_branches/ipp-20111122/Ohana/src/photdbc

Files:

• include/dvodist.h (added)
• src/AssignSkyToHost.c (modified) (1 diff)
• src/CopyFromHostLocation.c (added)
• src/CopyToHostLocation.c (modified) (3 diffs)
• src/HostTableLoad.c (modified) (2 diffs)
• src/Shutdown_dvodist.c (added)
• src/dvodist.c (modified) (3 diffs)
• src/initialize_dvodist.c (moved) (moved from branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/args_dvodist.c ) (5 diffs)
• src/md5_ops.c (added)

branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/AssignSkyToHost.c

@@ -29 +29 @@
     }
 
-
-
     // assign all regions to one of the Nhost hosts
     int N = MAX(table->Nhosts - 1, table->Nhosts * drand48());

branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/CopyToHostLocation.c

@@ -1 +1 @@
 # include "photdbc.h"
-# include <md5.h>
-# include <unistd.h> // needed?
 
 # define DEBUG 1
-# define NBUFFER 512
-# define NDIGEST  16
-
-# define DATA_ON_TGT       0x4000
-# define DATA_COPY_FAILURE 0x8000
-# define DATA_HOST_ID      0x3fff
 
 int CostToHostLocation (SkyList *skylist, HostTable *table) {
@@ -85 +77 @@
         
       // need to re-open and re-read tgtname to check md5sum
+      md5_byte_t tgtDigest[NDIGEST];
       get_md5_with_copy (tgtname, NULL, tgtDigest);
 
@@ -141 +134 @@
 */
 
-// read a file, get the md5 sum, optionally write to 'output'
-int get_md5_with_copy (char *input, char *output, md5_byte_t *digest) {
-
-  // open the src file
-  FILE *fInput = fopen (input, "r");
-  int fdInput = fileno (fInput);
-        
-  // open the tgt file
-  FILE *fOutput = NULL;
-  int fdOutput = 0;
-  if (output) {
-    fOutput = fopen (tgtname, "w");
-    fdOutput = fileno (fOutput);
-  }
-
-  int nbytes;
-  md5_state_t state;
-  md5_byte_t buffer[NBUFFER];
-
-  md5_init (&state);
-  while ((nbytes = read (fdInput, buffer, NBUFFER)) > 0) {
-    md5_append (&state, buffer, nbytes);
-    if (output) {
-      nbytes = write (fdOutput, buffer, NBUFFER);
-      // XXX check that we actually write out all nbytes...
-    }
-  }
-  md5_finish(&state, digest);
-        
-  fclose (fInput);
-  flush (fInput);
-
-  if (output) {
-    fclose (fOutput);
-    flush (fOutput);
-  }
-  return TRUE;
-}
-
 /* need to think a bit about behavior in the context of SPLIT vs MEF:
 

branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/HostTableLoad.c

@@ -1 +1 @@
 # include "photdbc.h"
 # define DEBUG 1
-
-typedef struct {
-  char *hostname;
-  char *pathname;
-  int hostID;
-} HostInfo
-
-typedef struct {
-    int Nhosts;
-  HostInfo *hosts;
-} HostTable
 
 void InitHosts (HostInfo *hosts, int Nhosts, int NHOSTS) {
@@ -34 +23 @@
 }
 
-HostTable *HostTableLoad () {
+HostTable *HostTableLoad (char *catdir) {
+
+  char *filename = NULL;
+
+  ALLOCATE (filename, char, strlen(catdir) + strlen("/HostTable.dat") + 1);
+  sprintf (filename, "%s/HostTable.dat", catdir);
 
   FILE *f = fopen (filename, "r");

branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/dvodist.c

@@ -1 @@
-# include "photdbc.h"
+# include "dvodist.h"
 
 int main (int argc, char **argv) {
@@ -8 +8 @@
 
   /* get configuration info, args, lockfile */
-  initialize_dvodist (argc, argv);
+  initialize (argc, argv);
+  char *catdir = strcreate (argv[1]);
+
+  LockDatabase (catdir);
 
   // dvodist (-out | -in)
   // dvodist -out : host table represents new target locations
   
-  hosts = HostTableLoad ();
+  HostTable *hosts = HostTableLoad (catdir);
+  if (NULL) {
+    Shutdown ("failed to load Host Table for %s\n", catdir);
+  }
 
-  // the output catalog needs to inherit the SKY_DEPTH of the input catalog
-  sky = SkyTableLoadOptimal (CATDIR, NULL, GSCFILE, TRUE, SKY_DEPTH_HST, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
-  skylist = SkyListByPatch (sky, -1, &REGION);
+  // load the current SkyTable. If SkyTable does not exist, we must fail
+  sky = SkyTableLoadOptimal (catdir, NULL, NULL, TRUE, SKY_DEPTH_HST, VERBOSE);
+  SkyTableSetFilenames (sky, catdir, "cpt");
+  skylist = SkyListByPatch (sky, -1, &UserPatch);
 
-  AssignSkyToHost (skylist, hosts);
+  switch (MODE) {
+    case MODE_OUT:
+      AssignSkyToHost (skylist, hosts);
+      CopyToHostLocation (skylist, hosts);
+      break;
+    case MODE_IN:
+      CopyFromHostLocation (skylist, hosts);
+      break;
+    default:
+      fprintf (stderr, "impossible!");
+      abort();
+  }
 
-  CopyToHostLocation (skylist, hosts);
-
+  // XXX probably need to make this a skyregion_io.c function
+  // char *SkyTableFilename (char *catdir);
   char *skyfile;
   ALLOCATE (skyfile, char, strlen(catdir) + strlen("/SkyTable.fits") + 1);
@@ -31 +48 @@
   exit (0);
 }
+
+/* things still missing AFAIK :
+
+ * switch based on MODE
+ * add header keyword to SkyTable to note existence of hostID
+ * code for CopyFromHostLocation
+ 
+ */

branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/initialize_dvodist.c

@@ -1 @@
-# include "photdbc.h"
+# include "dvodist.h"
 
-void initialize_dvodist (int argc, char **argv) {
+void initialize (int argc, char **argv) {
 
   /* are these set correctly? */
-  if (get_argument (argc, argv, "-h")) usage_dvodist();
-  if (get_argument (argc, argv, "--h")) usage_dvodist();
-  if (get_argument (argc, argv, "-help")) usage_dvodist();
-  if (get_argument (argc, argv, "--help")) usage_dvodist();
+  if (get_argument (argc, argv, "-h")) usage();
+  if (get_argument (argc, argv, "--h")) usage();
+  if (get_argument (argc, argv, "-help")) usage();
+  if (get_argument (argc, argv, "--help")) usage();
 
   // XXX anything? ConfigInit (&argc, argv);
@@ -13 +13 @@
 }
 
-void usage_dvodist() {
+void usage() {
 
   fprintf (stderr, "USAGE: dvodist (-out | -in) (catdir)\n\n");
@@ -36 +36 @@
 
   /* specify portion of the sky */
-  REGION.Rmin = 0;
-  REGION.Rmax = 360;
-  REGION.Dmin = -90;
-  REGION.Dmax = +90;
+  UserPatch.Rmin = 0;
+  UserPatch.Rmax = 360;
+  UserPatch.Dmin = -90;
+  UserPatch.Dmax = +90;
   if ((N = get_argument (argc, argv, "-region"))) {
     remove_argument (N, &argc, argv);
-    REGION.Rmin = atof (argv[N]);
+    UserPatch.Rmin = atof (argv[N]);
     remove_argument (N, &argc, argv);
-    REGION.Rmax = atof (argv[N]);
+    UserPatch.Rmax = atof (argv[N]);
     remove_argument (N, &argc, argv);
-    REGION.Dmin = atof (argv[N]);
+    UserPatch.Dmin = atof (argv[N]);
     remove_argument (N, &argc, argv);
-    REGION.Dmax = atof (argv[N]);
+    UserPatch.Dmax = atof (argv[N]);
     remove_argument (N, &argc, argv);
 
-    if (REGION.Rmin == REGION.Rmax) {
+    if (UserPatch.Rmin == UserPatch.Rmax) {
       fprintf (stderr, "ERROR: selected region is ill-defined: Rmin == Rmax\n");
       exit (2);
     }
-    if (REGION.Dmin == REGION.Dmax) {
+    if (UserPatch.Dmin == UserPatch.Dmax) {
       fprintf (stderr, "ERROR: selected region is ill-defined: Dmin == Dmax\n");
       exit (2);
@@ -61 +61 @@
   }
 
-  MODE = 0;
+  MODE = MODE_NONE;
   if ((N = get_argument (argc, argv, "-in"))) {
-    MODE = COPY_IN;
+    MODE = MODE_IN;
     remove_argument (N, &argc, argv);
   }
@@ -69 +69 @@
     if (!MODE) {
       fprintf (stderr, "ERROR: cannot use both -in and -out options!\n");
-      usage_dvodist();
+      usage();
     }
-    MODE = COPY_OUT;
+    MODE = MODE_OUT;
     remove_argument (N, &argc, argv);
   }
+  if (!MODE) usage();
 
   if (argc != 2) usage();