Skip to content

wait: support ptrace events for Linux #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

wait: support ptrace events for Linux #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/sys/wait.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const WSTOPPED: WaitPidFlag = WUNTRACED;
pub enum WaitStatus {
Exited(pid_t, i8),
Signaled(pid_t, signal::SigNum, bool),
Stopped(pid_t, signal::SigNum),
Stopped(pid_t, signal::SigNum, c_int),
Continued(pid_t),
StillAlive
}
Expand All @@ -51,6 +51,7 @@ pub enum WaitStatus {
target_os = "android"))]
mod status {
use sys::signal;
use libc::c_int;

pub fn exited(status: i32) -> bool {
(status & 0x7F) == 0
Expand Down Expand Up @@ -80,6 +81,10 @@ mod status {
((status & 0xFF00) >> 8) as signal::SigNum
}

pub fn stop_additional(status: i32) -> c_int {
(status >> 16) as c_int
}

pub fn continued(status: i32) -> bool {
status == 0xFFFF
}
Expand All @@ -89,6 +94,7 @@ mod status {
target_os = "ios"))]
mod status {
use sys::signal;
use libc::c_int;

const WCOREFLAG: i32 = 0x80;
const WSTOPPED: i32 = 0x7f;
Expand All @@ -105,6 +111,10 @@ mod status {
(status >> 8) as signal::SigNum
}

pub fn stop_additional(status: i32) -> c_int {
0
}

pub fn continued(status: i32) -> bool {
wstatus(status) == WSTOPPED && stop_signal(status) == 0x13
}
Expand Down Expand Up @@ -136,6 +146,7 @@ mod status {
target_os = "netbsd"))]
mod status {
use sys::signal;
use libc::c_int;

const WCOREFLAG: i32 = 0x80;
const WSTOPPED: i32 = 0x7f;
Expand All @@ -152,6 +163,10 @@ mod status {
(status >> 8) as signal::SigNum
}

pub fn stop_additional(status: i32) -> c_int {
0
}

pub fn signaled(status: i32) -> bool {
wstatus(status) != WSTOPPED && wstatus(status) != 0 && status != 0x13
}
Expand Down Expand Up @@ -183,7 +198,7 @@ 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) {
WaitStatus::Stopped(pid, status::stop_signal(status))
WaitStatus::Stopped(pid, status::stop_signal(status), status::stop_additional(status))
} else {
assert!(status::continued(status));
WaitStatus::Continued(pid)
Expand Down