diff options
| author | bors <bors@rust-lang.org> | 2014-03-28 11:21:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-28 11:21:47 -0700 |
| commit | fd4f15ea6b04fcacc8c8446c5d725c25daab0624 (patch) | |
| tree | c77eb7ce115419a982d6f32f692b26f080b68ee9 /src/libstd/libc.rs | |
| parent | b8601a3d8b91ad3b653d143307611f2f5c75617e (diff) | |
| parent | 0e190b9a4ad92645e8f63c72c66cc89a596f1971 (diff) | |
| download | rust-fd4f15ea6b04fcacc8c8446c5d725c25daab0624.tar.gz rust-fd4f15ea6b04fcacc8c8446c5d725c25daab0624.zip | |
auto merge of #13131 : alexcrichton/rust/issue-13124, r=brson
It turns out that on linux, and possibly other platforms, child processes will continue to accept signals until they have been *reaped*. This means that once the child has exited, it will succeed to receive signals until waitpid() has been invoked on it. This is unfortunate behavior, and differs from what is seen on OSX and windows. This commit changes the behavior of Process::signal() to be the same across platforms, and updates the documentation of Process::kill() to note that when signaling a foreign process it may accept signals until reaped. Implementation-wise, this invokes waitpid() with WNOHANG before each signal to the child to ensure that if the child has exited that we will reap it. Other possibilities include installing a SIGCHLD signal handler, but at this time I believe that that's too complicated. Closes #13124
Diffstat (limited to 'src/libstd/libc.rs')
| -rw-r--r-- | src/libstd/libc.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index 42221f07449..972002fe34e 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -2356,6 +2356,8 @@ pub mod consts { pub static CLOCK_REALTIME: c_int = 0; pub static CLOCK_MONOTONIC: c_int = 1; + + pub static WNOHANG: c_int = 1; } pub mod posix08 { } @@ -2802,6 +2804,8 @@ pub mod consts { pub static CLOCK_REALTIME: c_int = 0; pub static CLOCK_MONOTONIC: c_int = 4; + + pub static WNOHANG: c_int = 1; } pub mod posix08 { } @@ -3187,6 +3191,8 @@ pub mod consts { pub static PTHREAD_CREATE_JOINABLE: c_int = 1; pub static PTHREAD_CREATE_DETACHED: c_int = 2; pub static PTHREAD_STACK_MIN: size_t = 8192; + + pub static WNOHANG: c_int = 1; } pub mod posix08 { } |
