mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-14 02:49:40 +00:00
std: User a smaller stdin buffer on windows
Apparently windows doesn't like reading from stdin with a large buffer size, and it also apparently is ok with a smaller buffer size. This changes the reader returned by stdin() to return an 8k buffered reader for stdin rather than a 64k buffered reader. Apparently libuv has run into this before, taking a peek at their code, with a specific comment in their console code saying that "ReadConsole can't handle big buffers", which I presume is related to invoking ReadFile as if it were a file descriptor. Closes #13304
This commit is contained in:
parent
00cbda2d0a
commit
6ac34926a4
@ -99,7 +99,15 @@ fn src<T>(fd: libc::c_int, readable: bool, f: |StdSource| -> T) -> T {
|
|||||||
///
|
///
|
||||||
/// See `stdout()` for more notes about this function.
|
/// See `stdout()` for more notes about this function.
|
||||||
pub fn stdin() -> BufferedReader<StdReader> {
|
pub fn stdin() -> BufferedReader<StdReader> {
|
||||||
BufferedReader::new(stdin_raw())
|
// The default buffer capacity is 64k, but apparently windows doesn't like
|
||||||
|
// 64k reads on stdin. See #13304 for details, but the idea is that on
|
||||||
|
// windows we use a slighly smaller buffer that's been seen to be
|
||||||
|
// acceptable.
|
||||||
|
if cfg!(windows) {
|
||||||
|
BufferedReader::with_capacity(8 * 1024, stdin_raw())
|
||||||
|
} else {
|
||||||
|
BufferedReader::new(stdin_raw())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates a new non-blocking handle to the stdin of the current process.
|
/// Creates a new non-blocking handle to the stdin of the current process.
|
||||||
|
63
src/test/run-pass/issue-13304.rs
Normal file
63
src/test/run-pass/issue-13304.rs
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
// ignore-fast
|
||||||
|
|
||||||
|
extern crate green;
|
||||||
|
extern crate rustuv;
|
||||||
|
extern crate native;
|
||||||
|
|
||||||
|
use std::os;
|
||||||
|
use std::io;
|
||||||
|
use std::str;
|
||||||
|
|
||||||
|
#[start]
|
||||||
|
fn start(argc: int, argv: **u8) -> int {
|
||||||
|
green::start(argc, argv, rustuv::event_loop, main)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let args = os::args();
|
||||||
|
if args.len() > 1 && args[1].as_slice() == "child" {
|
||||||
|
if args[2].as_slice() == "green" {
|
||||||
|
child();
|
||||||
|
} else {
|
||||||
|
let (tx, rx) = channel();
|
||||||
|
native::task::spawn(proc() { tx.send(child()); });
|
||||||
|
rx.recv();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
parent(~"green");
|
||||||
|
parent(~"native");
|
||||||
|
let (tx, rx) = channel();
|
||||||
|
native::task::spawn(proc() {
|
||||||
|
parent(~"green");
|
||||||
|
parent(~"native");
|
||||||
|
tx.send(());
|
||||||
|
});
|
||||||
|
rx.recv();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parent(flavor: ~str) {
|
||||||
|
let args = os::args();
|
||||||
|
let mut p = io::Process::new(args[0].as_slice(), [~"child", flavor]).unwrap();
|
||||||
|
p.stdin.get_mut_ref().write_str("test1\ntest2\ntest3").unwrap();
|
||||||
|
let out = p.wait_with_output();
|
||||||
|
assert!(out.status.success());
|
||||||
|
let s = str::from_utf8(out.output.as_slice()).unwrap();
|
||||||
|
assert_eq!(s, "test1\n\ntest2\n\ntest3\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
fn child() {
|
||||||
|
for line in io::stdin().lines() {
|
||||||
|
println!("{}", line.unwrap());
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user