merge upstream async_worker
This commit is contained in:
parent
eda2512f0f
commit
a570afedde
@ -1,6 +1,31 @@
|
||||
from .async_worker import AsyncTaskScheduler, AsyncTask
|
||||
# MIT License
|
||||
#
|
||||
# Copyright (c) [2019] [andrew-ld]
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
from .async_worker import AsyncTaskScheduler, AsyncTask, OneLoopAsyncTask, SchedulerConfig
|
||||
|
||||
|
||||
__all__ = [
|
||||
"AsyncTaskScheduler",
|
||||
"AsyncTask"
|
||||
"AsyncTask",
|
||||
"OneLoopAsyncTask",
|
||||
"SchedulerConfig"
|
||||
]
|
||||
|
@ -22,6 +22,7 @@
|
||||
|
||||
import asyncio
|
||||
import abc
|
||||
import functools
|
||||
import typing
|
||||
import time
|
||||
import operator
|
||||
@ -30,18 +31,37 @@ import operator
|
||||
class AsyncTask(abc.ABC):
|
||||
_next: int
|
||||
_locked: bool
|
||||
_scheduler: 'AsyncTaskScheduler'
|
||||
|
||||
__slots__ = [
|
||||
"_next",
|
||||
"_locked"
|
||||
"_locked",
|
||||
"_scheduler"
|
||||
]
|
||||
|
||||
def __init__(self):
|
||||
self._next = 0
|
||||
self._locked = False
|
||||
|
||||
def set_scheduler(self, scheduler: 'AsyncTaskScheduler'):
|
||||
self._scheduler = scheduler
|
||||
|
||||
async def future(self, task: 'AsyncTask'):
|
||||
await self._scheduler.submit(task)
|
||||
|
||||
async def _process(self) -> typing.Union[bool, int]:
|
||||
result = await self.process()
|
||||
|
||||
if result is False:
|
||||
return False
|
||||
|
||||
if isinstance(result, int):
|
||||
return result * 1e9
|
||||
|
||||
raise ValueError
|
||||
|
||||
@abc.abstractmethod
|
||||
async def process(self) -> int:
|
||||
async def process(self) -> typing.Union[bool, int]:
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
@ -49,13 +69,13 @@ class AsyncTask(abc.ABC):
|
||||
raise NotImplementedError
|
||||
|
||||
def set_next(self, _next: int):
|
||||
self._next = time.time() + _next
|
||||
self._next = time.time_ns() + _next
|
||||
|
||||
def get_next(self) -> int:
|
||||
return self._next
|
||||
|
||||
def get_delay(self) -> int:
|
||||
return self.get_next() - time.time()
|
||||
return self.get_next() - time.time_ns()
|
||||
|
||||
def lock(self):
|
||||
self._locked = True
|
||||
@ -67,6 +87,16 @@ class AsyncTask(abc.ABC):
|
||||
return self._locked
|
||||
|
||||
|
||||
class OneLoopAsyncTask(AsyncTask, abc.ABC):
|
||||
async def _process(self) -> bool:
|
||||
await self.process()
|
||||
return False
|
||||
|
||||
@abc.abstractmethod
|
||||
async def process(self) -> typing.NoReturn:
|
||||
raise NotImplementedError
|
||||
|
||||
|
||||
class AsyncTaskDelay:
|
||||
_task: asyncio.Task
|
||||
_delay_end: int
|
||||
@ -77,18 +107,14 @@ class AsyncTaskDelay:
|
||||
]
|
||||
|
||||
def __init__(self):
|
||||
self._task = asyncio.ensure_future(asyncio.Future())
|
||||
self._task = asyncio.Future()
|
||||
self._delay_end = 0
|
||||
|
||||
async def sleep(self, _time) -> bool:
|
||||
self._delay_end = _time + time.time()
|
||||
|
||||
self._task = asyncio.ensure_future(
|
||||
asyncio.sleep(_time)
|
||||
)
|
||||
self._delay_end = _time + time.time_ns()
|
||||
self._task = asyncio.ensure_future(asyncio.sleep(_time // 1e9))
|
||||
|
||||
try:
|
||||
|
||||
await self._task
|
||||
|
||||
except asyncio.CancelledError:
|
||||
@ -126,22 +152,63 @@ class AsyncMultipleEvent:
|
||||
self._events.pop(0).set()
|
||||
|
||||
|
||||
class SchedulerConfig:
|
||||
imprecise_delay: int
|
||||
skippable_delay: int
|
||||
max_fast_submit_tasks: int
|
||||
|
||||
__slots__ = [
|
||||
"imprecise_delay",
|
||||
"skippable_delay",
|
||||
"max_fast_submit_tasks"
|
||||
]
|
||||
|
||||
def __init__(self,
|
||||
imprecise_delay: int = 2 * 1e+8,
|
||||
skippable_delay: int = 3 * 1e+8,
|
||||
max_fast_submit_tasks: int = 50
|
||||
):
|
||||
self.imprecise_delay = imprecise_delay
|
||||
self.skippable_delay = skippable_delay
|
||||
self.max_fast_submit_tasks = max_fast_submit_tasks
|
||||
|
||||
|
||||
def on_complete(
|
||||
the_task: AsyncTask,
|
||||
the_queue: list,
|
||||
the_lock: AsyncMultipleEvent,
|
||||
the_future: asyncio.Future,
|
||||
):
|
||||
result = the_future.result()
|
||||
|
||||
if result is False:
|
||||
the_queue.remove(the_task)
|
||||
|
||||
else:
|
||||
the_task.unlock()
|
||||
the_task.set_next(result)
|
||||
the_lock.unlock_first()
|
||||
|
||||
|
||||
class AsyncTaskScheduler:
|
||||
_queue: typing.List[AsyncTask]
|
||||
_wait_enqueue: AsyncMultipleEvent
|
||||
_wait_unlock: AsyncMultipleEvent
|
||||
_sleep_tasks: typing.List[AsyncTaskDelay]
|
||||
_config: SchedulerConfig
|
||||
|
||||
__slots__ = [
|
||||
"_queue",
|
||||
"_sleep_tasks",
|
||||
"_wait_enqueue",
|
||||
"_wait_unlock"
|
||||
"_wait_unlock",
|
||||
"_config"
|
||||
]
|
||||
|
||||
def __init__(self):
|
||||
def __init__(self, config: SchedulerConfig = SchedulerConfig()):
|
||||
self._queue = []
|
||||
self._sleep_tasks = []
|
||||
self._config = config
|
||||
|
||||
self._wait_enqueue = AsyncMultipleEvent()
|
||||
self._wait_unlock = AsyncMultipleEvent()
|
||||
@ -157,18 +224,45 @@ class AsyncTaskScheduler:
|
||||
max(cancellable_tasks).cancel()
|
||||
|
||||
async def loop(self):
|
||||
task: AsyncTask
|
||||
|
||||
sleeper = AsyncTaskDelay()
|
||||
self._sleep_tasks.append(sleeper)
|
||||
|
||||
while True:
|
||||
if not self._queue:
|
||||
await self._wait_enqueue.lock()
|
||||
await asyncio.sleep(0)
|
||||
|
||||
while self._queue:
|
||||
runnable_tasks = [*filter(lambda x: not x.is_locked(), self._queue)]
|
||||
|
||||
if not runnable_tasks:
|
||||
await self._wait_unlock.lock()
|
||||
await asyncio.sleep(0)
|
||||
continue
|
||||
|
||||
fast_submit_tasks = [*filter(lambda x: x.get_delay() <= self._config.imprecise_delay, runnable_tasks)]
|
||||
|
||||
if fast_submit_tasks:
|
||||
for task in fast_submit_tasks:
|
||||
task.lock()
|
||||
task.set_scheduler(self)
|
||||
|
||||
while fast_submit_tasks:
|
||||
futures = []
|
||||
|
||||
for task in fast_submit_tasks[:self._config.max_fast_submit_tasks]:
|
||||
on_done = functools.partial(on_complete, task, self._queue, self._wait_unlock)
|
||||
|
||||
future = asyncio.ensure_future(task._process())
|
||||
future.add_done_callback(on_done)
|
||||
|
||||
futures.append(future)
|
||||
|
||||
await asyncio.gather(*futures)
|
||||
fast_submit_tasks = fast_submit_tasks[self._config.max_fast_submit_tasks:]
|
||||
|
||||
continue
|
||||
|
||||
task, delay = min(
|
||||
@ -180,14 +274,15 @@ class AsyncTaskScheduler:
|
||||
key=operator.itemgetter(1)
|
||||
)
|
||||
|
||||
delay -= time.time()
|
||||
delay -= time.time_ns()
|
||||
task.lock()
|
||||
|
||||
if delay > 0 and not await sleeper.sleep(delay):
|
||||
if delay > self._config.skippable_delay and not await sleeper.sleep(delay):
|
||||
task.unlock()
|
||||
continue
|
||||
|
||||
next_delay = await task.process()
|
||||
task.set_scheduler(self)
|
||||
next_delay = await task._process()
|
||||
|
||||
if next_delay is False:
|
||||
self._queue.remove(task)
|
||||
|
Loading…
Reference in New Issue
Block a user