From cfe6a11e39725f42ac3fffac138d2de1587fe756 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Thu, 14 Sep 2023 14:07:04 +1000 Subject: [PATCH] extmod/asyncio/event.py: Fix ThreadSafeFlag.ioctl return. iobase_ioctl expects that an ioctl method must return an integer, and will raise otherwise. This was tripping up aioble on Unix, where the new hybrid modselect.c implementation will attempt to extract a file descriptor from the pollable via ioctl(MP_STREAM_GET_FILENO). However, ThreadSafeFlag's ioctl only supported MP_STREAM_POLL, and returned None otherwise. This makes it return `-1` (to match tests/extmod/select_poll_custom.py). It should probably be `-22` (corresponding to MP_EINVAL), but the value is never checked, and MP_EINVAL can be a different value on different ports. This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared --- extmod/asyncio/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extmod/asyncio/event.py b/extmod/asyncio/event.py index e0b41f7324..f11bb14e58 100644 --- a/extmod/asyncio/event.py +++ b/extmod/asyncio/event.py @@ -49,7 +49,7 @@ try: def ioctl(self, req, flags): if req == 3: # MP_STREAM_POLL return self.state * flags - return None + return -1 # Other requests are unsupported def set(self): self.state = 1