Changeset 33204

Timestamp:

Feb 6, 2012, 6:50:18 AM (14 years ago)

Author:

eugene

Message:

added some notes to dvosplit; working on dvodist

Location:

branches/eam_branches/ipp-20111122/Ohana/src

Files:

• dvosplit/src/dvosplit.c (modified) (4 diffs)
• libautocode/def/SkyRegion.d (modified) (1 diff)
• photdbc/src/AssignSkyToHost.c (added)
• photdbc/src/CopyToHostLocation.c (added)
• photdbc/src/HostTableLoad.c (modified) (6 diffs)
• photdbc/src/rconnect.c (added)

branches/eam_branches/ipp-20111122/Ohana/src/dvosplit/src/dvosplit.c

@@ -1 +1 @@
 # include "dvosplit.h"
 
+// XXX : go to this : dvosplit (catdir) (outlevel) [-region Rmin Rmax Dmin Dmax]
 // dvosplit (outlevel) [-region Rmin Rmax Dmin Dmax]
 int main (int argc, char **argv) {
@@ -14 +15 @@
   ConfigInit (&argc, argv);
   args (argc, argv);
+
+  // XXX : OUTCAT = strcreate (argv[1]);
+  // XXX : OUT_DEPTH = atoi (argv[2]);
 
   OUT_DEPTH = atoi (argv[1]);
@@ -29 +33 @@
     // if (current level >  out level) skip: cannot currently merge catalogs
     // if (current level == out level) skip: no action is needed
+    // XXX if outdir != indir, copy the tables across
     if (skylist[0].regions[i][0].depth >= OUT_DEPTH) continue;
 
@@ -51 +56 @@
     // change sky.regions[i].depth for these regions
     outlist = SkyListByPatch (sky, OUT_DEPTH, skylist[0].regions[i]);
+    // XXX update the filenames for outlist given the new outdir
 
     outcatalogs = open_output_catalogs (outlist);

branches/eam_branches/ipp-20111122/Ohana/src/libautocode/def/SkyRegion.d

@@ -8 +8 @@
 FIELD   Dmin,      D_MIN,          float, 
 FIELD   Dmax,      D_MAX,          float, 
-FIELD   childS,    CHILD_S,        int,           sequence number in full table of first child
-FIELD   childE,    CHILD_E,        int,           sequence number in full table of last child + 1
-FIELD   parent,    PARENT,         int,           sequence number in full table of parent
-FIELD   index,     INDEX,          int,           sequence number in full table of this entry
-FIELD   depth,     DEPTH,          char,          depth of this entry
-FIELD   child,     CHILD,          char,          does this entry have children?
-FIELD   table,     TABLE,          char,          does this entry have a table?
-FIELD   name,      NAME,           char[21],      name / filename
+FIELD   childS,    CHILD_S,        int,            sequence number in full table of first child
+FIELD   childE,    CHILD_E,        int,            sequence number in full table of last child + 1
+FIELD   parent,    PARENT,         int,            sequence number in full table of parent
+FIELD   index,     INDEX,          int,            sequence number in full table of this entry
+FIELD   depth,     DEPTH,          char,           depth of this entry
+FIELD   child,     CHILD,          char,           does this entry have children?
+FIELD   table,     TABLE,          char,           does this entry have a table?
+FIELD   name,      NAME,           char[19],       name / filename
+FIELD   hostID,    HOST_ID,        unsigned short, host ID where data is stored
+
+# note : 2012.02.05 : stole 2 bytes from 'name' to use for host ID (no
+#        DBs were created with more than 17 bytes in the name).  The
+#        hostID points at an entry in the host table (text file).
+#        There is no safety on this, but it is recoverable (by
+#        examining the directories) if misplaced.
+# 
+#        Note that SkyTables from databases generated in the past may
+#        have garbage characters here.  To ensure catch this
+#        condition, we add a header keyword to SkyTables in which the
+#        hostID has been set; if that is not present, the SkyTable
+#        loading software should init these bytes to 0 (== unassigned).

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

@@ -1 +1 @@
 # include "photdbc.h"
+# define DEBUG 1
 
 typedef struct {
@@ -48 +49 @@
   InitHosts (hosts, Nhosts, NHOSTS);
 
+  int maxID = 0;
+
   int Nline;
   for (Nline = 0; TRUE; Nline ++) {
@@ -69 +72 @@
     }
 
+    // check the validity of ID (0 < ID < MAX_SHORT)
+
+    if (ID < 1) {
+      fprint (stderr, "invalid host ID %d\n", ID);
+      exit (1);
+    }
+    if (ID > 65535) {
+      fprint (stderr, "invalid host ID %d\n", ID);
+      exit (1);
+    }
+    maxID = MAX(maxID, ID);
+
     hosts[Nhosts].hostID = ID;
     hosts[Nhosts].hostname = strcreate(tmphost);
@@ -85 +100 @@
   table->hosts = hosts;
 
+  ALLOCATE (table->index, unsigned short, maxID + 1);
+  for (i = 0; i <= maxID; i++) table->index[i] = -1;
+
+  for (i = 0; i < table->Nhosts; i++) {
+    if (table->index[table->hosts[i].hostID] == -1) {
+      fprintf (stderr, "error: duplicate hostID %d\n", table->hosts[i].hostID);
+      exit (1);
+    }
+    table->index[table->hosts[i].hostID] = i;
+  }
+
   return table;
 }
@@ -90 +116 @@
 int CheckHostsAndPaths (HostTable *table) {
 
+  int i;
+  int stdio[3];
   char command[64];
   char shell[64];
 
   strcpy (command, "ssh");
-  strcpy (shell, "pclient");
+  strcpy (shell, "csh");
 
   for (i = 0; i < table->Nhosts; i++) {
@@ -101 +129 @@
     if (DEBUG) fprintf (stderr, "starting host within thread\n");
 
-    pid = rconnect (command, host[0].hostname, shell, stdio);
+    pid = rconnect (command, table->hosts[i].hostname, shell, stdio);
     if (!pid) {     
       /** failure to start: extend retry period **/
       if (DEBUG) fprintf (stderr, "failure to start %s\n", table->hosts[i].hostname);
+      exit (1);
     }
+
+    // XXX check anything else?
+
+    // close the connection
+    close(stdio[0]);
+    close(stdio[1]);
+    close(stdio[2]);
+
+    status = check_dir_access (table->hosts[i].pathname, DEBUG);
+    if (!status) {
+      fprintf (stderr, "failed to find / create target path\n");
+      exit (2);
+    }
+
+    fprintf (stderr, "success : %s, %s\n", table->hosts[i].hostname, table->hosts[i].pathname);
   }
-
+  return (TRUE);
 }