Move ready_list_next from public trait

Author: tiif

src/shims/unix/linux/epoll.rs

@@ -432,7 +432,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         let mut array_iter = this.project_array_fields(&event)?;
 
         while let Some(des) = array_iter.next(this)? {
-            if let Some(epoll_event_instance) = this.ready_list_next(&mut ready_list) {
+            if let Some(epoll_event_instance) = ready_list_next(this, &mut ready_list) {
                 this.write_int_fields_named(
                     &[
                         ("events", epoll_event_instance.events.into()),
@@ -448,25 +448,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         Ok(Scalar::from_i32(num_of_events))
     }
 
-    /// This function takes in ready list and returns EpollEventInstance with file description
-    /// that is not closed.
-    fn ready_list_next(
-        &self,
-        ready_list: &mut BTreeMap<(FdId, i32), EpollEventInstance>,
-    ) -> Option<EpollEventInstance> {
-        let this = self.eval_context_ref();
-        while let Some((epoll_key, epoll_event_instance)) = ready_list.pop_first() {
-            // This ensures that we only return events that we are interested. The FD might have been closed since
-            // the event was generated, in which case we are not interested anymore.
-            // When a file description is fully closed, it gets removed from `machine.epoll_interests`,
-            // so we skip events whose FD is not in that map any more.
-            if this.machine.epoll_interests.get_epoll_interest(epoll_key.0).is_some() {
-                return Some(epoll_event_instance);
-            }
-        }
-        return None;
-    }
-
     /// For a specific file description, get its ready events and update the corresponding ready
     /// list. This function should be called whenever an event causes more bytes or an EOF to become
     /// newly readable from an FD, and whenever more bytes can be written to an FD or no more future
@@ -504,3 +485,21 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         Ok(())
     }
 }
+
+/// This function takes in ready list and returns EpollEventInstance with file description
+/// that is not closed.
+fn ready_list_next(
+    ecx: &MiriInterpCx<'_>,
+    ready_list: &mut BTreeMap<(FdId, i32), EpollEventInstance>,
+) -> Option<EpollEventInstance> {
+    while let Some((epoll_key, epoll_event_instance)) = ready_list.pop_first() {
+        // This ensures that we only return events that we are interested. The FD might have been closed since
+        // the event was generated, in which case we are not interested anymore.
+        // When a file description is fully closed, it gets removed from `machine.epoll_interests`,
+        // so we skip events whose FD is not in that map anymore.
+        if ecx.machine.epoll_interests.get_epoll_interest(epoll_key.0).is_some() {
+            return Some(epoll_event_instance);
+        }
+    }
+    return None;
+}