From 9993f0810c37bcb4d895221b28217dbbf690d315 Mon Sep 17 00:00:00 2001 From: David Hou Date: Sun, 16 Oct 2016 14:31:46 -0700 Subject: wait: Support ptrace events for Linux --- src/sys/wait.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/sys/wait.rs b/src/sys/wait.rs index 259efb70..018937a1 100644 --- a/src/sys/wait.rs +++ b/src/sys/wait.rs @@ -44,6 +44,8 @@ pub enum WaitStatus { Exited(pid_t, i8), Signaled(pid_t, Signal, bool), Stopped(pid_t, Signal), + #[cfg(any(target_os = "linux", target_os = "android"))] + PtraceEvent(pid_t, Signal, c_int), Continued(pid_t), StillAlive } @@ -52,6 +54,7 @@ pub enum WaitStatus { target_os = "android"))] mod status { use sys::signal::Signal; + use libc::c_int; pub fn exited(status: i32) -> bool { (status & 0x7F) == 0 @@ -81,6 +84,10 @@ mod status { Signal::from_c_int((status & 0xFF00) >> 8).unwrap() } + pub fn stop_additional(status: i32) -> c_int { + (status >> 16) as c_int + } + pub fn continued(status: i32) -> bool { status == 0xFFFF } @@ -184,6 +191,12 @@ fn decode(pid : pid_t, status: i32) -> WaitStatus { } else if status::signaled(status) { WaitStatus::Signaled(pid, status::term_signal(status), status::dumped_core(status)) } else if status::stopped(status) { + if cfg!(any(target_os = "linux", target_os = "android")) { + let status_additional = status::stop_additional(status); + if status_additional != 0 { + return WaitStatus::PtraceEvent(pid, status::stop_signal(status), status::stop_additional(status)) + } + } WaitStatus::Stopped(pid, status::stop_signal(status)) } else { assert!(status::continued(status)); -- cgit v1.2.3