Redo the interface for capture stdio.

runtime/bin/file.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/file.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
+#include "bin/embedded_dart_io.h"
 #include "bin/io_buffer.h"
 #include "bin/utils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_tools_api.h"
 
 namespace dart {
 namespace bin {
 
 static const int kMSPerSecond = 1000;
 
 // Are we capturing output from stdout for the VM service?
-bool File::capture_stdout_ = false;
+static bool capture_stdout = false;
 
 // Are we capturing output from stderr for the VM service?
-bool File::capture_stderr_ = false;
+static bool capture_stderr = false;
 
-// Are we capturing output from either stdout or stderr for the VM Service?
-bool File::capture_any_ = false;
+
+void SetCaptureStdout(bool value) {
+  capture_stdout = value;
+}
+
+
+void SetCaptureStderr(bool value) {
+  capture_stderr = value;
+}
+
+
+bool ShouldCaptureStdout() {
+  return capture_stdout;
+}
+
+
+bool ShouldCaptureStderr() {
+  return capture_stderr;
+}
+
 
 
 // The file pointer has been passed into Dart as an intptr_t and it is safe
 // to pull it out of Dart as a 64-bit integer, cast it to an intptr_t and
 // from there to a File pointer.
 static File* GetFilePointer(Dart_Handle handle) {
   intptr_t value = DartUtils::GetIntptrValue(handle);
   return reinterpret_cast<File*>(value);
 }
 
@@ skipping 17 matching lines @@
   int64_t remaining = num_bytes;
   const char* current_buffer = reinterpret_cast<const char*>(buffer);
   while (remaining > 0) {
     int64_t bytes_written = Write(current_buffer, remaining);
     if (bytes_written < 0) {
       return false;
     }
     remaining -= bytes_written;  // Reduce the number of remaining bytes.
     current_buffer += bytes_written;  // Move the buffer forward.
   }
-  if (capture_any_) {
+  if (capture_stdout || capture_stderr) {
     intptr_t fd = GetFD();
-    if (fd == STDOUT_FILENO && capture_stdout_) {
+    if (fd == STDOUT_FILENO && capture_stdout) {
       Dart_ServiceSendDataEvent("Stdout", "WriteEvent",
                                 reinterpret_cast<const uint8_t*>(buffer),
                                 num_bytes);
-    } else if (fd == STDERR_FILENO && capture_stderr_) {
+    } else if (fd == STDERR_FILENO && capture_stderr) {
       Dart_ServiceSendDataEvent("Stderr", "WriteEvent",
                                 reinterpret_cast<const uint8_t*>(buffer),
                                 num_bytes);
     }
   }
   return true;
 }
 
 
 File::FileOpenMode File::DartModeToFileMode(DartFileOpenMode mode) {
@@ skipping 1196 matching lines @@
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 }  // namespace bin
 }  // namespace dart