Changeset 33600 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/avextract.c

Timestamp:

Mar 23, 2012, 2:19:56 PM (14 years ago)

Author:

eugene

Message:

improve verbosity; clear some memory leaks in parallel ops

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/avextract.c (modified) (5 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/avextract.c

@@ -41 +41 @@
     remove_argument (N, &argc, argv);
     PARALLEL = TRUE;
+  }
+
+  // use remote tables, but not dvo_client..
+  int PARALLEL_LOCAL = FALSE;
+  HostTable *table = NULL;
+  if ((N = get_argument (argc, argv, "-parallel-local"))) {
+    remove_argument (N, &argc, argv);
+    PARALLEL_LOCAL = TRUE;
+
+    char *CATDIR = GetCATDIR();
+    if (!CATDIR) {
+      gprint (GP_ERR, "CATDIR is not set\n");
+      return FALSE;
+    }
+    SkyTable *sky = GetSkyTable();
+    if (!sky) {
+      gprint (GP_ERR, "failed to load sky table for database\n");
+      return FALSE;
+    }
+    table = HostTableLoad (CATDIR, sky->hosts);
+    if (!table) {
+      gprint (GP_ERR, "ERROR: failure reading Host Table %s for database %s\n", sky->hosts, CATDIR);
+      return FALSE;
+    }    
   }
 
@@ -96 +120 @@
   // this does all the work of re-packaging the command, calling it on the remote machines, then loading in the results
   if (PARALLEL && !HOST_ID) {
-    int status = HostTableParallelOps (argc, argv, RESULT_FILE, 0);
+    int status = HostTableParallelOps (argc, argv, RESULT_FILE, 0, VERBOSE);
 
     dbFreeFields (fields, Nfields);
@@ -141 +165 @@
     /* lock, load, unlock catalog */
     char hostfile[1024];
+    if (PARALLEL_LOCAL) {
+      int hostID = skylist[0].regions[i]->hostID;
+      int seq = table->index[hostID];
+      HOSTDIR = table->hosts[seq].pathname;
+    }
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
-    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
+    catalog.filename = (HOST_ID || PARALLEL_LOCAL) ? hostfile : skylist[0].filename[i];
     catalog.catflags = LOAD_AVES | LOAD_SECF;
     if (needMeasures) {
@@ -205 +234 @@
   }
 
+  if (table) free (table);
   if (vec) free (vec);
   if (values) free (values);
@@ -215 +245 @@
 
  escape:
+  if (table) free (table);
   if (vec) free (vec);
   if (values) free (values);