Skip to content

Commit

Permalink
auto merge of #13158 : alexcrichton/rust/issue-13123, r=brson
Browse files Browse the repository at this point in the history
Some unix platforms will send a SIGPIPE signal instead of returning EPIPE from a
syscall by default. The native runtime doesn't install a SIGPIPE handler,
causing the program to die immediately in this case. This brings the behavior in
line with libgreen by ignoring SIGPIPE and propagating EPIPE upwards to the
application in the form of an IoError.

Closes #13123
  • Loading branch information
bors committed Mar 28, 2014
2 parents fd4f15e + 68c2706 commit 42e1003
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 0 deletions.
18 changes: 18 additions & 0 deletions src/libnative/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,24 @@ pub fn start(argc: int, argv: **u8, main: proc()) -> int {
// frames above our current position.
let my_stack_bottom = my_stack_top + 20000 - OS_DEFAULT_STACK_ESTIMATE;

// When using libgreen, one of the first things that we do is to turn off
// the SIGPIPE signal (set it to ignore). By default, some platforms will
// send a *signal* when a EPIPE error would otherwise be delivered. This
// runtime doesn't install a SIGPIPE handler, causing it to kill the
// program, which isn't exactly what we want!
//
// Hence, we set SIGPIPE to ignore when the program starts up in order to
// prevent this problem.
#[cfg(windows)] fn ignore_sigpipe() {}
#[cfg(unix)] fn ignore_sigpipe() {
use std::libc;
use std::libc::funcs::posix01::signal::signal;
unsafe {
assert!(signal(libc::SIGPIPE, libc::SIG_IGN) != -1);
}
}
ignore_sigpipe();

rt::init(argc, argv);
let mut exit_code = None;
let mut main = Some(main);
Expand Down
30 changes: 30 additions & 0 deletions src/libstd/libc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ pub mod types {
}

pub enum timezone {}

pub type sighandler_t = size_t;
}
pub mod bsd44 {
use libc::types::os::arch::c95::{c_char, c_int, c_uint};
Expand Down Expand Up @@ -637,6 +639,8 @@ pub mod types {
}

pub enum timezone {}

pub type sighandler_t = size_t;
}
pub mod bsd44 {
use libc::types::os::arch::c95::{c_char, c_int, c_uint};
Expand Down Expand Up @@ -1206,6 +1210,8 @@ pub mod types {
}

pub enum timezone {}

pub type sighandler_t = size_t;
}

pub mod bsd44 {
Expand Down Expand Up @@ -2292,6 +2298,8 @@ pub mod consts {
use libc::types::os::arch::c95::{c_int, size_t};

pub static SIGTRAP : c_int = 5;
pub static SIGPIPE: c_int = 13;
pub static SIG_IGN: size_t = 1;

pub static GLOB_ERR : c_int = 1 << 0;
pub static GLOB_MARK : c_int = 1 << 1;
Expand Down Expand Up @@ -2743,6 +2751,8 @@ pub mod consts {
use libc::types::os::arch::c95::{c_int, size_t};

pub static SIGTRAP : c_int = 5;
pub static SIGPIPE: c_int = 13;
pub static SIG_IGN: size_t = 1;

pub static GLOB_APPEND : c_int = 0x0001;
pub static GLOB_DOOFFS : c_int = 0x0002;
Expand Down Expand Up @@ -3140,6 +3150,8 @@ pub mod consts {
use libc::types::os::arch::c95::{c_int, size_t};

pub static SIGTRAP : c_int = 5;
pub static SIGPIPE: c_int = 13;
pub static SIG_IGN: size_t = 1;

pub static GLOB_APPEND : c_int = 0x0001;
pub static GLOB_DOOFFS : c_int = 0x0002;
Expand Down Expand Up @@ -3844,6 +3856,24 @@ pub mod funcs {
}
}

pub mod signal {
use libc::types::os::arch::c95::c_int;
use libc::types::os::common::posix01::sighandler_t;

#[cfg(not(target_os = "android"))]
extern {
pub fn signal(signum: c_int,
handler: sighandler_t) -> sighandler_t;
}

#[cfg(target_os = "android")]
extern {
#[link_name = "bsd_signal"]
pub fn signal(signum: c_int,
handler: sighandler_t) -> sighandler_t;
}
}

pub mod wait {
use libc::types::os::arch::c95::{c_int};
use libc::types::os::arch::posix88::{pid_t};
Expand Down
36 changes: 36 additions & 0 deletions src/test/run-pass/sigpipe-should-be-ignored.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// 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.

// ignore-fast

// Be sure that when a SIGPIPE would have been received that the entire process
// doesn't die in a ball of fire, but rather it's gracefully handled.

use std::os;
use std::io::{PipeStream, Process};

fn test() {
let os::Pipe { input, out } = os::pipe();
let input = PipeStream::open(input);
let mut out = PipeStream::open(out);
drop(input);

let _ = out.write([1]);
}

fn main() {
let args = os::args();
if args.len() > 1 && args[1].as_slice() == "test" {
return test();
}

let mut p = Process::new(args[0], [~"test"]).unwrap();
assert!(p.wait().success());
}

0 comments on commit 42e1003

Please sign in to comment.