platform and pthread cleanup
This commit is contained in:
@@ -160,7 +160,7 @@ impl Pal for Sys {
|
||||
envp: *const *mut c_char,
|
||||
) -> Result<()> {
|
||||
let empty = b"\0";
|
||||
let empty_ptr = empty.as_ptr() as *const c_char;
|
||||
let empty_ptr = empty.as_ptr().cast::<c_char>();
|
||||
e_raw(syscall!(
|
||||
EXECVEAT,
|
||||
fildes,
|
||||
@@ -218,7 +218,7 @@ impl Pal for Sys {
|
||||
|
||||
fn fstat(fildes: c_int, mut buf: Out<stat>) -> Result<()> {
|
||||
let empty = b"\0";
|
||||
let empty_ptr = empty.as_ptr() as *const c_char;
|
||||
let empty_ptr = empty.as_ptr().cast::<c_char>();
|
||||
e_raw(unsafe {
|
||||
syscall!(
|
||||
NEWFSTATAT,
|
||||
@@ -248,7 +248,7 @@ impl Pal for Sys {
|
||||
let buf = buf.as_mut_ptr();
|
||||
|
||||
let mut kbuf = linux_statfs::default();
|
||||
let kbuf_ptr = &mut kbuf as *mut linux_statfs;
|
||||
let kbuf_ptr = &raw mut kbuf;
|
||||
e_raw(unsafe { syscall!(FSTATFS, fildes, kbuf_ptr) })?;
|
||||
|
||||
if !buf.is_null() {
|
||||
@@ -296,7 +296,7 @@ impl Pal for Sys {
|
||||
|
||||
#[inline]
|
||||
unsafe fn futex_wait(addr: *mut u32, val: u32, deadline: Option<×pec>) -> Result<()> {
|
||||
let deadline = deadline.map_or(0, |d| d as *const _ as usize);
|
||||
let deadline = deadline.map_or(0, |d| ptr::from_ref(d) as usize);
|
||||
e_raw(unsafe {
|
||||
syscall!(
|
||||
FUTEX, addr, // uaddr
|
||||
|
||||
@@ -62,7 +62,7 @@ impl PalSignal for Sys {
|
||||
SETITIMER,
|
||||
which,
|
||||
ptr::from_ref(new),
|
||||
old.map_or_else(ptr::null_mut, |r| ptr::from_mut(r))
|
||||
old.map_or_else(ptr::null_mut, ptr::from_mut)
|
||||
)
|
||||
})?;
|
||||
Ok(())
|
||||
@@ -86,8 +86,8 @@ impl PalSignal for Sys {
|
||||
syscall!(
|
||||
RT_SIGACTION,
|
||||
sig,
|
||||
act.as_ref().map_or_else(ptr::null, |x| ptr::from_ref(x)),
|
||||
oact.map_or_else(ptr::null_mut, |x| ptr::from_mut(x)),
|
||||
act.as_ref().map_or_else(ptr::null, ptr::from_ref),
|
||||
oact.map_or_else(ptr::null_mut, ptr::from_mut),
|
||||
mem::size_of::<sigset_t>()
|
||||
)
|
||||
})
|
||||
@@ -97,8 +97,8 @@ impl PalSignal for Sys {
|
||||
unsafe fn sigaltstack(ss: Option<&stack_t>, old_ss: Option<&mut stack_t>) -> Result<()> {
|
||||
e_raw(syscall!(
|
||||
SIGALTSTACK,
|
||||
ss.map_or_else(ptr::null, |x| ptr::from_ref(x)),
|
||||
old_ss.map_or_else(ptr::null_mut, |x| ptr::from_mut(x))
|
||||
ss.map_or_else(ptr::null, ptr::from_ref),
|
||||
old_ss.map_or_else(ptr::null_mut, ptr::from_mut)
|
||||
))
|
||||
.map(|_| ())
|
||||
}
|
||||
@@ -119,8 +119,8 @@ impl PalSignal for Sys {
|
||||
syscall!(
|
||||
RT_SIGPROCMASK,
|
||||
how,
|
||||
set.map_or_else(ptr::null, |x| ptr::from_ref(x)),
|
||||
oset.map_or_else(ptr::null_mut, |x| ptr::from_mut(x)),
|
||||
set.map_or_else(ptr::null, ptr::from_ref),
|
||||
oset.map_or_else(ptr::null_mut, ptr::from_mut),
|
||||
mem::size_of::<sigset_t>()
|
||||
)
|
||||
})
|
||||
@@ -147,8 +147,8 @@ impl PalSignal for Sys {
|
||||
e_raw(syscall!(
|
||||
RT_SIGTIMEDWAIT,
|
||||
ptr::from_ref(set),
|
||||
sig.map_or_else(ptr::null_mut, |s| ptr::from_mut(s)),
|
||||
tp.map_or_else(ptr::null, |t| ptr::from_ref(t)),
|
||||
sig.map_or_else(ptr::null_mut, ptr::from_mut),
|
||||
tp.map_or_else(ptr::null, ptr::from_ref),
|
||||
size_of::<sigset_t>()
|
||||
))
|
||||
.map(|s| s as c_int)
|
||||
|
||||
Reference in New Issue
Block a user