GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-31 10:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed race conditions on hid events cleanup

Browse Source
This commit is contained in:
Devaev Maxim
2020-08-18 10:57:02 +03:00
parent 28cc3fe99a
commit 6c35dd413d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kvmd/plugins/hid/otg/device.py
View File

@@ -126,7 +126,10 @@ class BaseDeviceProcess(multiprocessing.Process): # pylint: disable=too-many-in
def _clear_queue(self) -> None: def _clear_queue(self) -> None:
while not self.__events_queue.empty(): while not self.__events_queue.empty():
self.__events_queue.get_nowait() try:
self.__events_queue.get_nowait()
except queue.Empty:
break
def _ensure_write(self, report: bytes, reopen: bool=False, close: bool=False) -> bool: def _ensure_write(self, report: bytes, reopen: bool=False, close: bool=False) -> bool:
if reopen: if reopen:

5
kvmd/plugins/hid/serial.py
View File

@@ -298,7 +298,10 @@ class Plugin(BaseHid, multiprocessing.Process): # pylint: disable=too-many-inst
def clear_events(self) -> None: def clear_events(self) -> None:
while not self.__events_queue.empty(): while not self.__events_queue.empty():
self.__events_queue.get_nowait() try:
self.__events_queue.get_nowait()
except queue.Empty:
break
self.__queue_event(_ClearEvent()) self.__queue_event(_ClearEvent())
def __queue_event(self, event: _BaseEvent) -> None: def __queue_event(self, event: _BaseEvent) -> None: