Skip to content

Commit 9d409d9

Browse files
committed
Expose si_pid, si_uid, and si_status from siginfo_t as functions
On Linux, siginfo_t cannot expose these fields directly due to #716 , so expose them as functions, just like si_addr and si_value.
1 parent ab3c229 commit 9d409d9

File tree

5 files changed

+72
-0
lines changed

5 files changed

+72
-0
lines changed

src/unix/bsd/apple/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,14 @@ impl siginfo_t {
680680

681681
(*(self as *const siginfo_t as *const siginfo_timer)).si_value
682682
}
683+
684+
pub unsafe fn si_pid(&self) -> ::pid_t {
685+
self.si_pid
686+
}
687+
688+
pub unsafe fn si_uid(&self) -> ::uid_t {
689+
self.si_uid
690+
}
683691
}
684692

685693
cfg_if! {

src/unix/bsd/freebsdlike/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ impl siginfo_t {
3131
pub unsafe fn si_value(&self) -> ::sigval {
3232
self.si_value
3333
}
34+
35+
pub unsafe fn si_pid(&self) -> ::pid_t {
36+
self.si_pid
37+
}
38+
39+
pub unsafe fn si_uid(&self) -> ::uid_t {
40+
self.si_uid
41+
}
3442
}
3543

3644
s! {

src/unix/haiku/mod.rs

+14
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ impl ::Clone for timezone {
3838
}
3939
}
4040

41+
impl siginfo_t {
42+
pub unsafe fn si_addr(&self) -> *mut ::c_void {
43+
self.si_addr
44+
}
45+
46+
pub unsafe fn si_pid(&self) -> ::pid_t {
47+
self.si_pid
48+
}
49+
50+
pub unsafe fn si_uid(&self) -> ::uid_t {
51+
self.si_uid
52+
}
53+
}
54+
4155
s! {
4256
pub struct in_addr {
4357
pub s_addr: ::in_addr_t,

src/unix/linux_like/linux/gnu/mod.rs

+24
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,18 @@ s! {
287287
}
288288
}
289289

290+
// For internal casts to access union fields
291+
#[repr(C)]
292+
struct siginfo_sigchld {
293+
_si_signo: ::c_int,
294+
_si_errno: ::c_int,
295+
_si_code: ::c_int,
296+
_pad: ::c_int,
297+
si_pid: ::pid_t,
298+
si_uid: ::uid_t,
299+
si_status: ::c_int,
300+
}
301+
290302
impl siginfo_t {
291303
pub unsafe fn si_addr(&self) -> *mut ::c_void {
292304
#[repr(C)]
@@ -311,6 +323,18 @@ impl siginfo_t {
311323
}
312324
(*(self as *const siginfo_t as *const siginfo_timer)).si_sigval
313325
}
326+
327+
pub unsafe fn si_pid(&self) -> ::pid_t {
328+
(*(self as *const siginfo_t as *const siginfo_sigchld)).si_pid
329+
}
330+
331+
pub unsafe fn si_uid(&self) -> ::uid_t {
332+
(*(self as *const siginfo_t as *const siginfo_sigchld)).si_uid
333+
}
334+
335+
pub unsafe fn si_status(&self) -> ::c_int {
336+
(*(self as *const siginfo_t as *const siginfo_sigchld)).si_status
337+
}
314338
}
315339

316340
s_no_extra_traits! {

src/vxworks/mod.rs

+18
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,24 @@ impl ::Clone for _Vx_semaphore {
112112
}
113113
}
114114

115+
impl siginfo_t {
116+
pub unsafe fn si_addr(&self) -> *mut ::c_void {
117+
self.si_addr
118+
}
119+
120+
pub unsafe fn si_value(&self) -> ::sigval {
121+
self.si_value
122+
}
123+
124+
pub unsafe fn si_pid(&self) -> ::pid_t {
125+
self.si_pid
126+
}
127+
128+
pub unsafe fn si_uid(&self) -> ::uid_t {
129+
self.si_uid
130+
}
131+
}
132+
115133
s! {
116134
// b_pthread_condattr_t.h
117135
pub struct pthread_condattr_t {

0 commit comments

Comments
 (0)