Changeset 35091 for branches/eam_branches/ipp-20121219

Timestamp:

Feb 6, 2013, 11:12:46 AM (13 years ago)

Author:

eugene

Message:

handle case where only some of hosts were used for connection

File:

• branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/HostTable.c (modified) (5 diffs)

branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/HostTable.c

@@ -243 +243 @@
   Nmax ++;
 
+  // need the list of connected hosts for exit test below
+  int Nrunning = 0;
+  for (i = 0; i < table->Nhosts; i++) {
+    if (!table->hosts[i].pid) continue; // any unconnected hosts should be skipped
+    Nrunning ++;
+  }
+
   int Nfound = 0;
 
@@ -262 +269 @@
     // we have some sockets to check, check sockets for all hosts
     for (i = 0; (status > 0) && (i < table->Nhosts); i++) {
+      if (!table->hosts[i].pid) continue; // any unconnected hosts should be skipped
+
       if (FALSE && FD_ISSET (table->hosts[i].stdio[HOST_STDIN], &wtSet)) {
         // this host is waiting for input : this is an error, so exit
@@ -268 +277 @@
       }
       
-      if (FD_ISSET (table->hosts[i].stdio[HOST_STDOUT], &rdSet)) {
+      if ((table->hosts[i].stdio[HOST_STDOUT] > 0) && FD_ISSET (table->hosts[i].stdio[HOST_STDOUT], &rdSet)) {
         // this host has waiting output : read to buffer, and dump if necessary
         ReadtoIOBuffer (&table->hosts[i].stdout, table->hosts[i].stdio[HOST_STDOUT]);
@@ -282 +291 @@
       }
 
-      if (FD_ISSET (table->hosts[i].stdio[HOST_STDERR], &rdSet)) {
+      if ((table->hosts[i].stdio[HOST_STDERR] > 0) && FD_ISSET (table->hosts[i].stdio[HOST_STDERR], &rdSet)) {
         // this host has waiting output : read to buffer, and dump if necessary
         ReadtoIOBuffer (&table->hosts[i].stderr, table->hosts[i].stdio[HOST_STDERR]);
@@ -361 +370 @@
       }
       Nfound ++;
-      if (Nfound == table->Nhosts) goto escape; // we've harvested all jobs
+      if (Nfound == Nrunning) goto escape; // we've harvested all jobs
     }
   }