Skip to content

Commit 7a9a9cb

Browse files
committed
epoll: rename blocking_epoll_callback since it is not just called after unblocking
1 parent 87058a4 commit 7a9a9cb

File tree

1 file changed

+5
-4
lines changed
  • src/tools/miri/src/shims/unix/linux

1 file changed

+5
-4
lines changed

src/tools/miri/src/shims/unix/linux/epoll.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
480480
}
481481
if timeout == 0 || !ready_list_empty {
482482
// If the ready list is not empty, or the timeout is 0, we can return immediately.
483-
blocking_epoll_callback(epfd_value, weak_epfd, dest, &event, this)?;
483+
return_ready_list(epfd_value, weak_epfd, dest, &event, this)?;
484484
} else {
485485
// Blocking
486486
let timeout = match timeout {
@@ -508,7 +508,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
508508
event: MPlaceTy<'tcx>,
509509
}
510510
@unblock = |this| {
511-
blocking_epoll_callback(epfd_value, weak_epfd, &dest, &event, this)?;
511+
return_ready_list(epfd_value, weak_epfd, &dest, &event, this)?;
512512
interp_ok(())
513513
}
514514
@timeout = |this| {
@@ -636,8 +636,9 @@ fn check_and_update_one_event_interest<'tcx>(
636636
}
637637
}
638638

639-
/// Callback function after epoll_wait unblocks
640-
fn blocking_epoll_callback<'tcx>(
639+
/// Stores the ready list of the `epfd` epoll instance into `events` (which must be an array),
640+
/// and the number of returned events into `dest`.
641+
fn return_ready_list<'tcx>(
641642
epfd_value: i32,
642643
weak_epfd: WeakFileDescriptionRef,
643644
dest: &MPlaceTy<'tcx>,

0 commit comments

Comments
 (0)