Changeset 33880

Timestamp:

May 16, 2012, 4:24:44 PM (14 years ago)

Author:

eugene

Message:

only print stderr / stdout from remove dvo hosts if buffer contains data

File:

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

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

@@ -271 +271 @@
         // if (table->hosts[i].stdout.Nbuffer > 0x10000) {
         if (table->hosts[i].stdout.Nbuffer > 0x1000) {
-          int printHead = VERBOSE || table->hosts[i].stdout.Nbuffer;
-          if (printHead) fprintf (stdout, "--- stdout from %s ---\n", table->hosts[i].hostname);
+          int printHead = VERBOSE || (table->hosts[i].stdout.Nbuffer > 0);
+          if (printHead) fprintf (stdout, "--- stdout from %s --- (%d bytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stdout.Nbuffer);
           write (STDOUT_FILENO, table->hosts[i].stdout.buffer, table->hosts[i].stdout.Nbuffer);
           FlushIOBuffer (&table->hosts[i].stdout);
@@ -284 +284 @@
         // if (table->hosts[i].stderr.Nbuffer > 0x10000) {
         if (table->hosts[i].stderr.Nbuffer > 0x1000) {
-          int printHead = VERBOSE || table->hosts[i].stderr.Nbuffer;
-          if (printHead) fprintf (stdout, "--- stderr from %s ---\n", table->hosts[i].hostname);
+          int printHead = VERBOSE || (table->hosts[i].stderr.Nbuffer > 0);
+          if (printHead) fprintf (stdout, "--- stderr from %s --- (%d bytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stderr.Nbuffer);
           write (STDOUT_FILENO, table->hosts[i].stderr.buffer, table->hosts[i].stderr.Nbuffer);
           FlushIOBuffer (&table->hosts[i].stderr);
@@ -321 +321 @@
         // read stdout
         int printHead;
-        printHead = VERBOSE || host->stdout.Nbuffer;
+        printHead = VERBOSE || (host->stdout.Nbuffer > 0);
         EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]);
-        if (printHead) fprintf (stdout, "--- stdout from %s ---\n", host->hostname);
+        if (printHead) fprintf (stdout, "--- stdout from %s --- (%d bytes, v2)\n", host->hostname, host->stdout.Nbuffer);
         write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer);
         FlushIOBuffer (&host->stdout);
@@ -329 +329 @@
             
         // read stderr
-        printHead = VERBOSE || host->stderr.Nbuffer;
+        printHead = VERBOSE || (host->stderr.Nbuffer > 0);
         EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]);
-        if (printHead) fprintf (stdout, "--- stderr from %s ---\n", host->hostname);
+        if (printHead) fprintf (stdout, "--- stderr from %s --- (%d bytes, v2)\n", host->hostname, host->stderr.Nbuffer);
         write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer);
         FlushIOBuffer (&host->stderr);