std: Chunk writing to stdout on windows
This just takes a similar approach to reading stdin on windows by artificially limiting the size of the buffers going in and out. Closes #14940
This commit is contained in:
parent
09967665ea
commit
d400563e17
2 changed files with 39 additions and 4 deletions
|
@ -31,6 +31,7 @@ use failure::local_stderr;
|
||||||
use fmt;
|
use fmt;
|
||||||
use io::{Reader, Writer, IoResult, IoError, OtherIoError,
|
use io::{Reader, Writer, IoResult, IoError, OtherIoError,
|
||||||
standard_error, EndOfFile, LineBufferedWriter, BufferedReader};
|
standard_error, EndOfFile, LineBufferedWriter, BufferedReader};
|
||||||
|
use iter::Iterator;
|
||||||
use kinds::Send;
|
use kinds::Send;
|
||||||
use libc;
|
use libc;
|
||||||
use option::{Option, Some, None};
|
use option::{Option, Some, None};
|
||||||
|
@ -40,7 +41,9 @@ use rt;
|
||||||
use rt::local::Local;
|
use rt::local::Local;
|
||||||
use rt::task::Task;
|
use rt::task::Task;
|
||||||
use rt::rtio::{DontClose, IoFactory, LocalIo, RtioFileStream, RtioTTY};
|
use rt::rtio::{DontClose, IoFactory, LocalIo, RtioFileStream, RtioTTY};
|
||||||
|
use slice::ImmutableVector;
|
||||||
use str::StrSlice;
|
use str::StrSlice;
|
||||||
|
use uint;
|
||||||
|
|
||||||
// And so begins the tale of acquiring a uv handle to a stdio stream on all
|
// And so begins the tale of acquiring a uv handle to a stdio stream on all
|
||||||
// platforms in all situations. Our story begins by splitting the world into two
|
// platforms in all situations. Our story begins by splitting the world into two
|
||||||
|
@ -355,10 +358,18 @@ impl StdWriter {
|
||||||
|
|
||||||
impl Writer for StdWriter {
|
impl Writer for StdWriter {
|
||||||
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
|
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
|
||||||
match self.inner {
|
// As with stdin on windows, stdout often can't handle writes of large
|
||||||
TTY(ref mut tty) => tty.write(buf),
|
// sizes. For an example, see #14940. For this reason, chunk the output
|
||||||
File(ref mut file) => file.write(buf),
|
// buffer on windows, but on unix we can just write the whole buffer all
|
||||||
}.map_err(IoError::from_rtio_error)
|
// at once.
|
||||||
|
let max_size = if cfg!(windows) {64 * 1024} else {uint::MAX};
|
||||||
|
for chunk in buf.chunks(max_size) {
|
||||||
|
try!(match self.inner {
|
||||||
|
TTY(ref mut tty) => tty.write(chunk),
|
||||||
|
File(ref mut file) => file.write(chunk),
|
||||||
|
}.map_err(IoError::from_rtio_error))
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
24
src/test/run-pass/issue-14940.rs
Normal file
24
src/test/run-pass/issue-14940.rs
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
// Copyright 2012-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.
|
||||||
|
|
||||||
|
use std::os;
|
||||||
|
use std::io::{stdio, Command};
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let args = os::args();
|
||||||
|
if args.len() > 1 {
|
||||||
|
let mut out = stdio::stdout();
|
||||||
|
out.write(['a' as u8, ..128 * 1024]).unwrap();
|
||||||
|
} else {
|
||||||
|
let out = Command::new(args.get(0).as_slice()).arg("child").output();
|
||||||
|
let out = out.unwrap();
|
||||||
|
assert!(out.status.success());
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue