GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 17:20:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

common background systasks

Browse Source
This commit is contained in:
Devaev Maxim 2020-09-05 09:26:55 +03:00
parent e162d84d56
commit 482eeec3e7
3 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kvmd/apps/kvmd/server.py
View File

@ -112,13 +112,14 @@ class _Component:
obj: object obj: object
get_state: Optional[Callable[[], Coroutine[Any, Any, Dict]]] = None get_state: Optional[Callable[[], Coroutine[Any, Any, Dict]]] = None
poll_state: Optional[Callable[[], AsyncGenerator[Dict, None]]] = None poll_state: Optional[Callable[[], AsyncGenerator[Dict, None]]] = None
systask: Optional[Callable[[], Coroutine[Any, Any, None]]] = None
cleanup: Optional[Callable[[], Coroutine[Any, Any, Dict]]] = None cleanup: Optional[Callable[[], Coroutine[Any, Any, Dict]]] = None
def __post_init__(self) -> None: def __post_init__(self) -> None:
if isinstance(self.obj, BasePlugin): if isinstance(self.obj, BasePlugin):
object.__setattr__(self, "name", f"{self.name} ({self.obj.get_plugin_name()})") object.__setattr__(self, "name", f"{self.name} ({self.obj.get_plugin_name()})")
for field in ["get_state", "poll_state", "cleanup"]: for field in ["get_state", "poll_state", "systask", "cleanup"]:
object.__setattr__(self, field, getattr(self.obj, field, None)) object.__setattr__(self, field, getattr(self.obj, field, None))
if self.get_state or self.poll_state: if self.get_state or self.poll_state:
assert self.event_type, self assert self.event_type, self
@ -288,6 +289,8 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
self.__run_system_task(self.__stream_controller) self.__run_system_task(self.__stream_controller)
for component in self.__components: for component in self.__components:
if component.systask:
self.__run_system_task(component.systask)
if component.poll_state: if component.poll_state:
self.__run_system_task(self.__poll_state, component.event_type, component.poll_state()) self.__run_system_task(self.__poll_state, component.event_type, component.poll_state())
self.__run_system_task(self.__stream_snapshoter) self.__run_system_task(self.__stream_snapshoter)

29
kvmd/apps/kvmd/ugpio.py
View File

@ -201,29 +201,16 @@ class UserGpio:
} }
async def poll_state(self) -> AsyncGenerator[Dict, None]: async def poll_state(self) -> AsyncGenerator[Dict, None]:
reader_task = asyncio.create_task(self.__reader.poll())
waiter_task: Optional[asyncio.Task] = None
prev_state: Dict = {} prev_state: Dict = {}
try: while True:
while True: state = await self.get_state()
if reader_task.cancelled(): if state != prev_state:
break yield state
if reader_task.done(): prev_state = state
RuntimeError("BatchReader task is dead") await self.__state_notifier.wait()
state = await self.get_state() async def systask(self) -> None:
if state != prev_state: await self.__reader.poll()
yield state
prev_state = state
if waiter_task is None:
waiter_task = asyncio.create_task(self.__state_notifier.wait())
if waiter_task in (await aiotools.wait_first(reader_task, waiter_task))[0]:
waiter_task = None
finally:
if not reader_task.done():
reader_task.cancel()
await reader_task
async def cleanup(self) -> None: async def cleanup(self) -> None:
for gout in self.__outputs.values(): for gout in self.__outputs.values():

29
kvmd/plugins/msd/otg/__init__.py
View File

@ -206,29 +206,16 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
} }
async def poll_state(self) -> AsyncGenerator[Dict, None]: async def poll_state(self) -> AsyncGenerator[Dict, None]:
inotify_task = asyncio.create_task(self.__watch_inotify())
waiter_task: Optional[asyncio.Task] = None
prev_state: Dict = {} prev_state: Dict = {}
try: while True:
while True: state = await self.get_state()
if inotify_task.cancelled(): if state != prev_state:
break yield state
if inotify_task.done(): prev_state = state
RuntimeError("Inotify task is dead") await self.__state_notifier.wait()
state = await self.get_state() async def systask(self) -> None:
if state != prev_state: await self.__watch_inotify()
yield state
prev_state = state
if waiter_task is None:
waiter_task = asyncio.create_task(self.__state_notifier.wait())
if waiter_task in (await aiotools.wait_first(inotify_task, waiter_task))[0]:
waiter_task = None
finally:
if not inotify_task.done():
inotify_task.cancel()
await inotify_task
@aiotools.atomic @aiotools.atomic
async def reset(self) -> None: async def reset(self) -> None: