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

Side by Side Diff: runtime/bin/stdio_patch.dart

Issue 850333002: Revert "Revert "Make stdout/stderr async"" (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/bin/stdio_macos.cc ('k') | runtime/bin/stdio_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 patch class _StdIOUtils { 5 patch class _StdIOUtils {
6 static Stdin _getStdioInputStream() { 6 static Stdin _getStdioInputStream() {
7 switch (_getStdioHandleType(0)) { 7 switch (_getStdioHandleType(0)) {
8 case _STDIO_HANDLE_TYPE_TERMINAL: 8 case _STDIO_HANDLE_TYPE_TERMINAL:
9 case _STDIO_HANDLE_TYPE_PIPE: 9 case _STDIO_HANDLE_TYPE_PIPE:
10 case _STDIO_HANDLE_TYPE_SOCKET: 10 case _STDIO_HANDLE_TYPE_SOCKET:
11 return new Stdin._(new _Socket._readPipe(0)); 11 return new Stdin._(new _Socket._readPipe(0));
12 case _STDIO_HANDLE_TYPE_FILE: 12 case _STDIO_HANDLE_TYPE_FILE:
13 return new Stdin._(new _FileStream.forStdin()); 13 return new Stdin._(new _FileStream.forStdin());
14 default: 14 default:
15 throw new FileSystemException("Unsupported stdin type"); 15 throw new FileSystemException("Unsupported stdin type");
16 } 16 }
17 } 17 }
18 18
19 static _getStdioOutputStream(int fd) { 19 static _getStdioOutputStream(int fd) {
20 wrap(sink) {
21 if (fd == 1) {
22 return new Stdout._(sink);
23 } else {
24 return new _StdSink(sink);
25 }
26 }
20 assert(fd == 1 || fd == 2); 27 assert(fd == 1 || fd == 2);
21 switch (_getStdioHandleType(fd)) { 28 switch (_getStdioHandleType(fd)) {
22 case _STDIO_HANDLE_TYPE_TERMINAL: 29 case _STDIO_HANDLE_TYPE_TERMINAL:
23 case _STDIO_HANDLE_TYPE_PIPE: 30 case _STDIO_HANDLE_TYPE_PIPE:
24 case _STDIO_HANDLE_TYPE_SOCKET: 31 case _STDIO_HANDLE_TYPE_SOCKET:
25 case _STDIO_HANDLE_TYPE_FILE: 32 case _STDIO_HANDLE_TYPE_FILE:
26 return new Stdout._(new IOSink(new _StdConsumer(fd)), fd); 33 return wrap(new IOSink(new _FileStreamConsumer.fromStdio(fd)));
27 default: 34 default:
28 throw new FileSystemException("Unsupported stdin type"); 35 throw new FileSystemException("Unsupported stdin type");
29 } 36 }
30 } 37 }
31 38
32 static int _socketType(nativeSocket) { 39 static int _socketType(nativeSocket) {
33 var result = _getSocketType(nativeSocket); 40 var result = _getSocketType(nativeSocket);
34 if (result is OSError) { 41 if (result is OSError) {
35 throw new FileSystemException("Error retreiving socket type", result); 42 throw new FileSystemException("Error retreiving socket type", result);
36 } 43 }
(...skipping 12 matching lines...) Expand all
49 /* patch */ bool get lineMode => _lineMode; 56 /* patch */ bool get lineMode => _lineMode;
50 /* patch */ void set lineMode(bool enabled) { _lineMode = enabled; } 57 /* patch */ void set lineMode(bool enabled) { _lineMode = enabled; }
51 58
52 static bool get _echoMode native "Stdin_GetEchoMode"; 59 static bool get _echoMode native "Stdin_GetEchoMode";
53 static void set _echoMode(bool enabled) native "Stdin_SetEchoMode"; 60 static void set _echoMode(bool enabled) native "Stdin_SetEchoMode";
54 static bool get _lineMode native "Stdin_GetLineMode"; 61 static bool get _lineMode native "Stdin_GetLineMode";
55 static void set _lineMode(bool enabled) native "Stdin_SetLineMode"; 62 static void set _lineMode(bool enabled) native "Stdin_SetLineMode";
56 } 63 }
57 64
58 patch class Stdout { 65 patch class Stdout {
59 /* patch */ bool _hasTerminal(int fd) { 66 /* patch */ bool get hasTerminal {
60 try { 67 try {
61 _terminalSize(fd); 68 _terminalSize;
62 return true; 69 return true;
63 } catch (_) { 70 } catch (_) {
64 return false; 71 return false;
65 } 72 }
66 } 73 }
67 74
68 /* patch */ int _terminalColumns(int fd) => _terminalSize(fd)[0]; 75 /* patch */ int get terminalColumns => _terminalSize[0];
69 /* patch */ int _terminalLines(int fd) => _terminalSize(fd)[1]; 76 /* patch */ int get terminalLines => _terminalSize[1];
70 77
71 static List _terminalSize(int fd) { 78 static List get _terminalSize {
72 var size = _getTerminalSize(fd); 79 var size = _getTerminalSize();
73 if (size is! List) { 80 if (size is! List) {
74 throw new StdoutException("Could not get terminal size", size); 81 throw new StdoutException("Could not get terminal size", size);
75 } 82 }
76 return size; 83 return size;
77 } 84 }
78 85
79 static _getTerminalSize(int fd) native "Stdout_GetTerminalSize"; 86 static _getTerminalSize() native "Stdout_GetTerminalSize";
80 } 87 }
81 88
82 89
83 _getStdioHandle(_NativeSocket socket, int num) native "Socket_GetStdioHandle"; 90 _getStdioHandle(_NativeSocket socket, int num) native "Socket_GetStdioHandle";
84 _getSocketType(_NativeSocket nativeSocket) native "Socket_GetType"; 91 _getSocketType(_NativeSocket nativeSocket) native "Socket_GetType";
OLDNEW
« no previous file with comments | « runtime/bin/stdio_macos.cc ('k') | runtime/bin/stdio_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698