daniil-berg/asyncio-taskpool
1
0
Fork 0
generated from daniil-berg/boilerplate-py
Code Issues Pull Requests Projects Releases 31 Wiki Activity

refactoring/renaming

Browse Source
This commit is contained in:
Daniil Fajnberg 2022-02-06 13:49:57 +01:00
parent b5eed608b5
commit ba0d5fca85
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/asyncio_taskpool/pool.py
View File

@ -106,20 +106,18 @@ class BaseTaskPool:
"""Returns a standardized name for a task with a specific `task_id`.""" """Returns a standardized name for a task with a specific `task_id`."""
return f'{self}_Task-{task_id}' return f'{self}_Task-{task_id}'
async def _cancel_task(self, task_id: int, custom_callback: CancelCallbackT = None) -> None: async def _task_cancellation(self, task_id: int, custom_callback: CancelCallbackT = None) -> None:
log.debug("Cancelling %s ...", self._task_name(task_id)) log.debug("Cancelling %s ...", self._task_name(task_id))
task = self._running.pop(task_id) self._cancelled[task_id] = self._running.pop(task_id)
assert task is not None
self._cancelled[task_id] = task
self._num_cancelled += 1 self._num_cancelled += 1
log.debug("Cancelled %s", self._task_name(task_id)) log.debug("Cancelled %s", self._task_name(task_id))
await _execute_function(custom_callback, args=(task_id, )) await _execute_function(custom_callback, args=(task_id, ))
async def _end_task(self, task_id: int, custom_callback: EndCallbackT = None) -> None: async def _task_ending(self, task_id: int, custom_callback: EndCallbackT = None) -> None:
task = self._running.pop(task_id, None) try:
if task is None: self._ended[task_id] = self._running.pop(task_id)
task = self._cancelled.pop(task_id) except KeyError:
self._ended[task_id] = task self._ended[task_id] = self._cancelled.pop(task_id)
self._num_ended += 1 self._num_ended += 1
self._enough_room.release() self._enough_room.release()
log.info("Ended %s", self._task_name(task_id)) log.info("Ended %s", self._task_name(task_id))
@ -131,9 +129,9 @@ class BaseTaskPool:
try: try:
return await awaitable return await awaitable
except CancelledError: except CancelledError:
await self._cancel_task(task_id, custom_callback=cancel_callback) await self._task_cancellation(task_id, custom_callback=cancel_callback)
finally: finally:
await self._end_task(task_id, custom_callback=end_callback) await self._task_ending(task_id, custom_callback=end_callback)
async def _start_task(self, awaitable: Awaitable, ignore_closed: bool = False, end_callback: EndCallbackT = None, async def _start_task(self, awaitable: Awaitable, ignore_closed: bool = False, end_callback: EndCallbackT = None,
cancel_callback: CancelCallbackT = None) -> int: cancel_callback: CancelCallbackT = None) -> int: