Skip to content

Fix test_poll::test_poll3 #5718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2025
Merged

Fix test_poll::test_poll3 #5718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05f9829
test_poll3
youknowone Apr 18, 2025
ca17cb9
Refactor EventMask
youknowone Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Lib/test/test_poll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ def test_poll2(self):
else:
self.fail('Unexpected return value from select.poll: %s' % fdlist)

# TODO: RUSTPYTHON int overflow
@unittest.expectedFailure
def test_poll3(self):
# test int overflow
pollster = select.poll()
Expand Down
60 changes: 50 additions & 10 deletions stdlib/src/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,10 @@ mod decl {
};
use libc::pollfd;
use num_traits::{Signed, ToPrimitive};
use std::time::{Duration, Instant};
use std::{
convert::TryFrom,
time::{Duration, Instant},
};

#[derive(Default)]
pub(super) struct TimeoutArg<const MILLIS: bool>(pub Option<Duration>);
Expand Down Expand Up @@ -417,25 +420,62 @@ mod decl {
search(fds, fd).ok().map(|i| fds.remove(i))
}

// new EventMask type
#[derive(Copy, Clone)]
#[repr(transparent)]
pub struct EventMask(pub i16);

impl TryFromObject for EventMask {
fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
use crate::builtins::PyInt;
let int = obj
.downcast::<PyInt>()
.map_err(|_| vm.new_type_error("argument must be an integer".to_owned()))?;

let val = int.as_bigint();
if val.is_negative() {
return Err(vm.new_value_error("negative event mask".to_owned()));
}

// Try converting to i16, should raise OverflowError if too large
let mask = i16::try_from(val).map_err(|_| {
vm.new_overflow_error("event mask value out of range".to_owned())
})?;

Ok(EventMask(mask))
}
}

const DEFAULT_EVENTS: i16 = libc::POLLIN | libc::POLLPRI | libc::POLLOUT;

#[pyclass]
impl PyPoll {
#[pymethod]
fn register(&self, Fildes(fd): Fildes, eventmask: OptionalArg<u16>) {
insert_fd(
&mut self.fds.lock(),
fd,
eventmask.map_or(DEFAULT_EVENTS, |e| e as i16),
)
fn register(
&self,
Fildes(fd): Fildes,
eventmask: OptionalArg<EventMask>,
) -> PyResult<()> {
let mask = match eventmask {
OptionalArg::Present(event_mask) => event_mask.0,
OptionalArg::Missing => DEFAULT_EVENTS,
};
insert_fd(&mut self.fds.lock(), fd, mask);
Ok(())
}

#[pymethod]
fn modify(&self, Fildes(fd): Fildes, eventmask: u16) -> io::Result<()> {
fn modify(
&self,
Fildes(fd): Fildes,
eventmask: EventMask,
vm: &VirtualMachine,
) -> PyResult<()> {
let mut fds = self.fds.lock();
// CPython raises KeyError if fd is not registered, match that behavior
let pfd = get_fd_mut(&mut fds, fd)
.ok_or_else(|| io::Error::from_raw_os_error(libc::ENOENT))?;
pfd.events = eventmask as i16;
.ok_or_else(|| vm.new_key_error(vm.ctx.new_int(fd).into()))?;
pfd.events = eventmask.0;
Ok(())
}

Expand Down
Loading