Skip to content

Commit

Permalink
Expose si_addr on siginfo_t. Refs rust-lang#716
Browse files Browse the repository at this point in the history
  • Loading branch information
alex committed Apr 14, 2019
1 parent 363ba93 commit 0660c33
Showing 1 changed file with 99 additions and 11 deletions.
110 changes: 99 additions & 11 deletions src/unix/notbsd/linux/other/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,104 @@
pub type __priority_which_t = ::c_uint;

cfg_if! {
if #[cfg(libc_union)] {
#[repr(C)]
#[derive(Copy, Clone)]
struct addr_bnd_t {
lower: *mut ::c_void,
upper: *mut ::c_void,
}

#[repr(C)]
#[derive(Copy, Clone)]
union sigfault_t_anonymous_union {
addr_bnd: addr_bnd_t,
pkey: u32,
}

#[repr(C)]
#[derive(Copy, Clone)]
struct sigfault_t {
addr: *mut ::c_void,
#[cfg(target_arch = "sparc")]
trapno: ::c_int,
addr_lsb: ::c_short,
anonymous_union: sigfault_t_anonymous_union,
}

#[repr(C)]
#[derive(Copy, Clone)]
union sifields_t {
_pad: [::c_int; 29],
sigfault: sigfault_t,
}

impl ::fmt::Debug for sigfault_t_anonymous_union {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
// TODO: no idea how to tell which of the members is used
f.debug_struct("sigfault_t_anonymous_union")
.finish()
}
}

impl ::fmt::Debug for sigfault_t {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
// TODO: include trapno on Sparc
f.debug_struct("sigfault_t")
.field("addr", &self.addr)
.field("addr_lsb", &self.addr_lsb)
.field("anonymous_union", &self.anonymous_union)
.finish()
}
}

impl ::fmt::Debug for sifields_t {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
// No way to print anything more detailed without the
// discriminant from siginfo_t
f.debug_struct("sifields_t").finish()
}
}
} else {
type sifields = [::c_int; 29];
}
}

s_no_extra_traits! {
pub struct siginfo_t {
pub si_signo: ::c_int,
pub si_errno: ::c_int,
pub si_code: ::c_int,
sifields: sifields_t,

#[cfg(target_arch = "x86_64")]
_align: [u64; 0],
#[cfg(not(target_arch = "x86_64"))]
_align: [usize; 0],
}
}

cfg_if! {
if #[cfg(libc_union)] {
impl siginfo_t {
pub unsafe fn si_addr(&self) -> *mut ::c_void {
self.sifields.sigfault.addr
}
}
}
}

impl ::fmt::Debug for siginfo_t {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
// TODO: include fields from sifields
f.debug_struct("siginfo_t")
.field("si_signo", &self.si_signo)
.field("si_errno", &self.si_errno)
.field("si_code", &self.si_code)
.finish()
}
}

s! {
pub struct aiocb {
pub aio_fildes: ::c_int,
Expand Down Expand Up @@ -44,17 +143,6 @@ s! {
pub ss_size: ::size_t
}

pub struct siginfo_t {
pub si_signo: ::c_int,
pub si_errno: ::c_int,
pub si_code: ::c_int,
pub _pad: [::c_int; 29],
#[cfg(target_arch = "x86_64")]
_align: [u64; 0],
#[cfg(not(target_arch = "x86_64"))]
_align: [usize; 0],
}

pub struct glob64_t {
pub gl_pathc: ::size_t,
pub gl_pathv: *mut *mut ::c_char,
Expand Down

0 comments on commit 0660c33

Please sign in to comment.