Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1937)

Unified Diff: runtime/bin/file.cc

Issue 1232193003: Provide stdout and stderr output in the Observatory debugger. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: before commit Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/builtin_natives.cc ('k') | runtime/bin/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/file.cc
diff --git a/runtime/bin/file.cc b/runtime/bin/file.cc
index 59f8300a266fb602b639043a82ebd4f2e0ed2980..8175d9b3710febe11f99a7ed944a1cce4a24d18d 100644
--- a/runtime/bin/file.cc
+++ b/runtime/bin/file.cc
@@ -10,12 +10,22 @@
#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 either stdout or stderr for the VM Service?
+bool capture_stdio = false;
+
+// Are we capturing output from stdout for the VM service?
+bool capture_stdout = false;
+
+// Are we capturing output from stderr for the VM service?
+bool capture_stderr = false;
+
// 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
@@ -52,6 +62,18 @@ bool File::WriteFully(const void* buffer, int64_t num_bytes) {
remaining -= bytes_written; // Reduce the number of remaining bytes.
current_buffer += bytes_written; // Move the buffer forward.
}
+ if (capture_stdio) {
+ intptr_t fd = GetFD();
+ 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) {
+ Dart_ServiceSendDataEvent("Stderr", "WriteEvent",
+ reinterpret_cast<const uint8_t*>(buffer),
+ num_bytes);
+ }
+ }
return true;
}
@@ -581,7 +603,7 @@ void FUNCTION_NAME(File_ResolveSymbolicLinks)(Dart_NativeArguments args) {
void FUNCTION_NAME(File_OpenStdio)(Dart_NativeArguments args) {
int64_t fd = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 0));
- ASSERT(fd == 0 || fd == 1 || fd == 2);
+ ASSERT(fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO);
File* file = File::OpenStdio(static_cast<int>(fd));
Dart_SetReturnValue(args, Dart_NewInteger(reinterpret_cast<intptr_t>(file)));
}
@@ -589,7 +611,7 @@ void FUNCTION_NAME(File_OpenStdio)(Dart_NativeArguments args) {
void FUNCTION_NAME(File_GetStdioHandleType)(Dart_NativeArguments args) {
int64_t fd = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 0));
- ASSERT(fd == 0 || fd == 1 || fd == 2);
+ ASSERT(fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO);
File::StdioHandleType type = File::GetStdioHandleType(static_cast<int>(fd));
Dart_SetReturnValue(args, Dart_NewInteger(type));
}
« no previous file with comments | « runtime/bin/builtin_natives.cc ('k') | runtime/bin/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698