Changeset 33227

Timestamp:

Feb 10, 2012, 7:21:08 AM (14 years ago)

Author:

eugene

Message:

working on parallel setphot

Location:

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

Files:

• ImageSubset.c (added)
• setphot_client.c (added)
• uniphot.c (modified) (1 diff)
• update.c (modified) (2 diffs)
• update_catalog.c (modified) (1 diff)
• update_setphot.c (modified) (1 diff)
• update_setphot_client.c (added)

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

@@ -74 +74 @@
   if (!UPDATE) exit (0);
 
-  update (&db, sgroup, Nsgroup);
+  update_dvo_uniphot (&db, sgroup, Nsgroup);
   dvo_image_unlock (&db); 
 

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/update.c

@@ -2 +2 @@
 # include <glob.h>
 
-void update (FITS_DB *db, Group *sgroup, int Nsgroup) {
+// update images & catalogs for uniphot
+void update_dvo_uniphot (FITS_DB *db, Group *sgroup, int Nsgroup) {
 
   off_t i, Nimage, Nkeep, *keep;
@@ -102 +103 @@
 
     fprintf (stderr, "catalog: %s sgroup: %d %s %f\n", catalog.filename, Nmin, sgroup[Nmin].label, Rmin);
-    update_dvo_catalog (&catalog, &sgroup[Nmin], (Rmin > 2*RADIUS)); 
+    update_catalog_uniphot (&catalog, &sgroup[Nmin], (Rmin > 2*RADIUS)); 
     dvo_catalog_save (&catalog, VERBOSE);
     dvo_catalog_unlock (&catalog);

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/update_catalog.c

@@ -1 +1 @@
 # include "uniphot.h"
 
-void update_dvo_catalog (Catalog *catalog, Group *sgroup, int warn) {
+// update a single catalog for uniphot
+void update_catalog_uniphot (Catalog *catalog, Group *sgroup, int warn) {
 
   int i, j, m, found;

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/update_setphot.c

@@ -10 +10 @@
 int update_setphot_parallel () {
 
-   return (TRUE);
+  strcpy (connect, "ssh");
+
+  // load the list of hosts
+  HostTable *table = HostTableLoad (catdir, "HostTable.dat");
+
+  for (i = 0; i < table->Nhosts; i++) {
+
+    char command[1024];
+    snprintf (command, 1024, "setphot_update_catalogs");
+
+    // launch the job on the remote machine (no handshake)
+    int pid = rconnect (connect, table->hosts[i].hostname, command, table->hosts[i].stdio, &errorInfo, FALSE);
+    if (!pid) {
+      if (DEBUG) fprintf (stderr, "failure to start %s (error %d)\n", table->hosts[i].hostname, errorInfo);
+      exit (1);
+    }
+    table->hosts[i].pid; // save for future reference
+
+    // check that all hosts started OK?
+  }
+
+  // watch for stdout / stderr from those jobs...
+  // wait for all of them to complete...
+
+  return (TRUE);
 }