user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass dest place reference to epoll_wait

Browse source
This commit is contained in:
tiif 2024-08-24 23:28:23 +08:00
parent e8175a42f7
commit 41ab4ecc03
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/tools/miri/src/shims/unix/linux/epoll.rs
View file

@ -430,7 +430,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
events_op: &OpTy<'tcx>,
maxevents: &OpTy<'tcx>,
timeout: &OpTy<'tcx>,
dest: MPlaceTy<'tcx>,
dest: &MPlaceTy<'tcx>,
) -> InterpResult<'tcx> {
let this = self.eval_context_mut();
@ -442,7 +442,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
if epfd_value <= 0 || maxevents <= 0 {
let einval = this.eval_libc("EINVAL");
this.set_last_error(einval)?;
this.write_int(-1, &dest)?;
this.write_int(-1, dest)?;
return Ok(());
}
@ -455,7 +455,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
let Some(epfd) = this.machine.fds.get(epfd_value) else {
let result_value: i32 = this.fd_not_found()?;
this.write_int(result_value, &dest)?;
this.write_int(result_value, dest)?;
return Ok(());
};
// Create a weak ref of epfd and pass it to callback so we will make sure that epfd
@ -476,7 +476,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
}
if timeout == 0 || !ready_list_empty {
// If the ready list is not empty, or the timeout is 0, we can return immediately.
this.blocking_epoll_callback(epfd_value, weak_epfd, &dest, &event)?;
this.blocking_epoll_callback(epfd_value, weak_epfd, dest, &event)?;
} else {
// Blocking
let timeout = match timeout {
@ -492,6 +492,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
}
};
thread_ids.push(this.active_thread());
let dest = dest.clone();
this.block_thread(
BlockReason::Epoll,
timeout,

2
src/tools/miri/src/shims/unix/linux/foreign_items.rs
View file

@ -62,7 +62,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
"epoll_wait" => {
let [epfd, events, maxevents, timeout] =
this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
this.epoll_wait(epfd, events, maxevents, timeout, dest.clone())?;
this.epoll_wait(epfd, events, maxevents, timeout, dest)?;
}
"eventfd" => {
let [val, flag] =