Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-153005: Fix timeout handling in concurrent.interpreters.Queue #153006

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

Closed
tonghuaroot wants to merge 1 commit into from
+50 −10
Closed

gh-153005: Fix timeout handling in concurrent.interpreters.Queue #153006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions Lib/concurrent/interpreters/_queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,15 @@ def put(self, obj, block=True, timeout=None, *,
else:
unboundop, = _serialize_unbound(unbounditems)
if timeout is not None:
timeout = int(timeout)
if timeout < 0:
raise ValueError(f'timeout value must be non-negative')
end = time.time() + timeout
timeout = float(timeout)
if not timeout >= 0: # also rejects NaN
raise ValueError('timeout value must be non-negative')
end = time.monotonic() + timeout
while True:
try:
_queues.put(self._id, obj, unboundop)
except QueueFull:
if timeout is not None and time.time() >= end:
if timeout is not None and time.monotonic() >= end:
raise # re-raise
time.sleep(_delay)
else:
Expand All @@ -252,15 +252,15 @@ def get(self, block=True, timeout=None, *,
if not block:
return self.get_nowait()
if timeout is not None:
timeout = int(timeout)
if timeout < 0:
raise ValueError(f'timeout value must be non-negative')
end = time.time() + timeout
timeout = float(timeout)
if not timeout >= 0: # also rejects NaN
raise ValueError('timeout value must be non-negative')
end = time.monotonic() + timeout
while True:
try:
obj, unboundop = _queues.get(self._id)
except QueueEmpty:
if timeout is not None and time.time() >= end:
if timeout is not None and time.monotonic() >= end:
raise # re-raise
time.sleep(_delay)
else:
Expand Down
37 changes: 37 additions & 0 deletions Lib/test/test_interpreters/test_queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import importlib
import pickle
import threading
import time
from textwrap import dedent
import unittest

Expand Down Expand Up @@ -354,6 +355,42 @@ def test_get_timeout(self):
with self.assertRaises(queues.QueueEmpty):
queue.get(HUGE_TIMEOUT, 0.1)

def test_put_timeout_fractional(self):
# A fractional timeout must not be truncated to whole seconds.
queue = queues.create(1)
queue.put(None)
start = time.monotonic()
with self.assertRaises(queues.QueueFull):
queue.put(None, timeout=0.1)
self.assertGreaterEqual(time.monotonic() - start, 0.05)

def test_get_timeout_fractional(self):
# A fractional timeout must not be truncated to whole seconds.
queue = queues.create()
start = time.monotonic()
with self.assertRaises(queues.QueueEmpty):
queue.get(timeout=0.1)
self.assertGreaterEqual(time.monotonic() - start, 0.05)

def test_timeout_zero_does_not_block(self):
queue = queues.create(1)
queue.put(None)
start = time.monotonic()
with self.assertRaises(queues.QueueFull):
queue.put(None, timeout=0)
self.assertLess(time.monotonic() - start, 1.0)
empty = queues.create()
with self.assertRaises(queues.QueueEmpty):
empty.get(timeout=0)

def test_timeout_invalid(self):
queue = queues.create()
for bad in (-0.5, float('nan')):
with self.assertRaisesRegex(ValueError, 'non-negative'):
queue.get(timeout=bad)
with self.assertRaisesRegex(ValueError, 'non-negative'):
queue.put(None, timeout=bad)

def test_get_nowait(self):
queue = queues.create()
with self.assertRaises(queues.QueueEmpty):
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2026-07-04-16-44-43.gh-issue-153005.lWdjWt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix :meth:`concurrent.interpreters.Queue.get` and
:meth:`concurrent.interpreters.Queue.put` truncating a floating-point *timeout*
to whole seconds. A negative or NaN timeout now raises :exc:`ValueError`.
Loading