Changeset 33478

Timestamp:

Mar 11, 2012, 2:53:37 PM (14 years ago)

Author:

eugene

Message:

flush I/O buffers; do not test STDIN for data req

File:

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

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

@@ -234 +234 @@
     timeout.tv_usec = 500000;
 
-    int status = select (Nmax, &rdSet, &wtSet, NULL, &timeout);
+    int status = select (Nmax, NULL, &wtSet, NULL, &timeout);
     if (status == -1) {
       perror("select()");
@@ -251 +251 @@
         // this host has waiting output : read to buffer, and dump if necessary
         ReadtoIOBuffer (&table->hosts[i].stdout, table->hosts[i].stdio[HOST_STDOUT]);
-        if (table->hosts[i].stdout.Nbuffer > 0x10000) {
+        // if (table->hosts[i].stdout.Nbuffer > 0x10000) {
+        if (table->hosts[i].stdout.Nbuffer > 0x1000) {
           fprintf (stdout, "--- stdout from %s ---\n", table->hosts[i].hostname);
           write (STDOUT_FILENO, table->hosts[i].stdout.buffer, table->hosts[i].stdout.Nbuffer);
+          FlushIOBuffer (&table->hosts[i].stdout);
           fprintf (stdout, "\n");
         }
@@ -261 +263 @@
         // this host has waiting output : read to buffer, and dump if necessary
         ReadtoIOBuffer (&table->hosts[i].stderr, table->hosts[i].stdio[HOST_STDERR]);
-        if (table->hosts[i].stderr.Nbuffer > 0x10000) {
+        // if (table->hosts[i].stderr.Nbuffer > 0x10000) {
+        if (table->hosts[i].stderr.Nbuffer > 0x1000) {
           fprintf (stdout, "--- stderr from %s ---\n", table->hosts[i].hostname);
           write (STDOUT_FILENO, table->hosts[i].stderr.buffer, table->hosts[i].stderr.Nbuffer);
+          FlushIOBuffer (&table->hosts[i].stderr);
           fprintf (stdout, "\n");
         }
@@ -274 +278 @@
       int pid = waitpid (-1, &status, WNOHANG);
       if (!pid) {
+        // fprintf (stderr, "no hosts to harvest\n");
+        usleep (500000);
         break; // no outstanding jobs have finished 
-        fprintf (stderr, "no hosts to harvest\n");
-        usleep (500000);
       }
       if ((pid == -1) && (errno == ECHILD)) goto escape; // no more jobs on which to wait
@@ -298 +302 @@
         fprintf (stdout, "--- stdout from %s ---\n", table->hosts[j].hostname);
         write (STDOUT_FILENO, table->hosts[j].stdout.buffer, table->hosts[j].stdout.Nbuffer);
+        FlushIOBuffer (&table->hosts[i].stdout);
         fprintf (stdout, "\n");
             
@@ -304 +309 @@
         fprintf (stdout, "--- stderr from %s ---\n", table->hosts[j].hostname);
         write (STDOUT_FILENO, table->hosts[j].stderr.buffer, table->hosts[j].stderr.Nbuffer);
+        FlushIOBuffer (&table->hosts[i].stderr);
         fprintf (stdout, "\n");