Changeset 33912 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 25, 2012, 10:07:50 AM (14 years ago)

Author:

eugene

Message:

allow remote launch to be verbose

Location:

branches/eam_branches/ipp-20120405/Ohana/src/opihi

Files:

• dvo/dvo_host_utils.c (modified) (6 diffs)
• include/dvoshell.h (modified) (1 diff)

branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/dvo_host_utils.c

@@ -6 +6 @@
 # define DVO_MAX_PATH 1024
 
-int HostTableLaunchJobs (HostTable *table, char *basecmd, char *options) {
+int HostTableLaunchJobs (HostTable *table, char *basecmd, char *options, int VERBOSE) {
 
   char uniquer[12];
@@ -13 +13 @@
   snprintf (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
 
+  int top_status = TRUE;
   int i;
   for (i = 0; i < table->Nhosts; i++) {
@@ -38 +39 @@
     free (commandFile);
 
-    if (DEBUG || PARALLEL_MANUAL) fprintf (stderr, "command: %s\n", command);
+    if (VERBOSE) gprint (GP_ERR, "command: %s\n", command);
 
     if (PARALLEL_MANUAL) {
@@ -47 +48 @@
       int status = system (command);
       if (status) {
-        fprintf (stderr, "ERROR running relphot_client\n");
-        exit (2);
+        gprint (GP_ERR, "ERROR running relphot_client\n");
+        top_status = FALSE;
       }
     } else {
@@ -55 +56 @@
       int pid = rconnect ("ssh", 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);
+        gprint (GP_ERR, "failure to start %s (error %d)\n", table->hosts[i].hostname, errorInfo);
+        top_status = FALSE;
+        continue;
       }
       table->hosts[i].pid = pid; // save for future reference
     }
   }
-  return TRUE;
+  return top_status;
 }
 
@@ -126 +128 @@
 
   // launch this command remotely
-  HostTableLaunchJobs (table, basecmd, options);
+  HostTableLaunchJobs (table, basecmd, options, VERBOSE);
   free (options);
   free (basecmd);

branches/eam_branches/ipp-20120405/Ohana/src/opihi/include/dvoshell.h

@@ -99 +99 @@
 dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
 
-int          HostTableLaunchJobs    PROTO((HostTable *table, char *basecmd, char *options));
+int          HostTableLaunchJobs    PROTO((HostTable *table, char *basecmd, char *options, int VERBOSE));
 int          HostTableParallelOps   PROTO((int argc, char **argv, char *ResultFile, int Nelements, int VERBOSE));
 int          HostTableReloadResults PROTO((char *uniquer, int VERBOSE));