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

Skip to content

bpo-46771: Review tweaks #31483

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
Feb 22, 2022
Merged

bpo-46771: Review tweaks #31483

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
5f82e16
Rename deadline to when(), clean up type annotations
Tinche Feb 22, 2022
e93f5de
Revert cancel counters for future PR
Tinche Feb 22, 2022
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: 11 additions & 9 deletions Lib/asyncio/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def __init__(self, coro, *, loop=None, name=None):
else:
self._name = str(name)

self._num_cancels_requested = 0
self._cancel_requested = False
self._must_cancel = False
self._fut_waiter = None
self._coro = coro
Expand Down Expand Up @@ -202,9 +202,9 @@ def cancel(self, msg=None):
self._log_traceback = False
if self.done():
return False
self._num_cancels_requested += 1
if self._num_cancels_requested > 1:
if self._cancel_requested:
return False
self._cancel_requested = True
if self._fut_waiter is not None:
if self._fut_waiter.cancel(msg=msg):
# Leave self._fut_waiter; it may be a Task that
Expand All @@ -216,13 +216,15 @@ def cancel(self, msg=None):
self._cancel_message = msg
return True

def cancelling(self) -> int:
return self._num_cancels_requested
def cancelling(self):
return self._cancel_requested

def uncancel(self) -> int:
if self._num_cancels_requested > 0:
self._num_cancels_requested -= 1
return self._num_cancels_requested
def uncancel(self):
if self._cancel_requested:
self._cancel_requested = False
return True
else:
return False

def __step(self, exc=None):
if self.done():
Expand Down
3 changes: 1 addition & 2 deletions Lib/asyncio/timeouts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ def __init__(self, deadline: Optional[float]) -> None:
self._task: Optional[tasks.Task[Any]] = None
self._deadline = deadline

@property
def deadline(self) -> Optional[float]:
def when(self) -> Optional[float]:
return self._deadline

def reschedule(self, deadline: Optional[float]) -> None:
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_asyncio/test_timeouts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async def test_timeout_at_basic(self):
async with asyncio.timeout_at(deadline) as cm:
await asyncio.sleep(10)
self.assertTrue(cm.expired())
self.assertEqual(deadline, cm.deadline)
self.assertEqual(deadline, cm.when())

async def test_nested_timeouts(self):
cancel = False
Expand Down Expand Up @@ -89,7 +89,7 @@ async def test_timeout_disabled(self):
t1 = loop.time()

self.assertFalse(cm.expired())
self.assertIsNone(cm.deadline)
self.assertIsNone(cm.when())
# finised fast. Very busy CI box requires high enough limit,
# that's why 0.01 cannot be used
self.assertLess(t1-t0, 2)
Expand All @@ -102,7 +102,7 @@ async def test_timeout_at_disabled(self):
t1 = loop.time()

self.assertFalse(cm.expired())
self.assertIsNone(cm.deadline)
self.assertIsNone(cm.when())
# finised fast. Very busy CI box requires high enough limit,
# that's why 0.01 cannot be used
self.assertLess(t1-t0, 2)
Expand Down
24 changes: 16 additions & 8 deletions Modules/_asynciomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ typedef struct {
PyObject *task_context;
int task_must_cancel;
int task_log_destroy_pending;
int task_num_cancels_requested;
int task_cancel_requested;
} TaskObj;

typedef struct {
Expand Down Expand Up @@ -2040,7 +2040,7 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop,
Py_CLEAR(self->task_fut_waiter);
self->task_must_cancel = 0;
self->task_log_destroy_pending = 1;
self->task_num_cancels_requested = 0;
self->task_cancel_requested = 0;
Py_INCREF(coro);
Py_XSETREF(self->task_coro, coro);

Expand Down Expand Up @@ -2207,10 +2207,10 @@ _asyncio_Task_cancel_impl(TaskObj *self, PyObject *msg)
Py_RETURN_FALSE;
}

self->task_num_cancels_requested += 1;
if (self->task_num_cancels_requested > 1) {
if (self->task_cancel_requested) {
Py_RETURN_FALSE;
}
self->task_cancel_requested = 1;

if (self->task_fut_waiter) {
PyObject *res;
Expand Down Expand Up @@ -2256,7 +2256,12 @@ _asyncio_Task_cancelling_impl(TaskObj *self)
/*[clinic end generated code: output=803b3af96f917d7e input=c50e50f9c3ca4676]*/
/*[clinic end generated code]*/
{
return PyLong_FromLong(self->task_num_cancels_requested);
if (self->task_cancel_requested) {
Py_RETURN_TRUE;
}
else {
Py_RETURN_FALSE;
}
}

/*[clinic input]
Expand All @@ -2275,10 +2280,13 @@ _asyncio_Task_uncancel_impl(TaskObj *self)
/*[clinic end generated code: output=58184d236a817d3c input=5db95e28fcb6f7cd]*/
/*[clinic end generated code]*/
{
if (self->task_num_cancels_requested > 0) {
self->task_num_cancels_requested -= 1;
if (self->task_cancel_requested) {
self->task_cancel_requested = 0;
Py_RETURN_TRUE;
}
else {
Py_RETURN_FALSE;
}
return PyLong_FromLong(self->task_num_cancels_requested);
}

/*[clinic input]
Expand Down