github.com/lowobservable.oec
1
0
Fork 0
mirror of https://github.com/lowobservable/oec.git synced 2026-04-15 16:10:17 +00:00
Code Issues Projects Releases Wiki Activity

Refactor POLL delay

Browse Source
This commit is contained in:
Andrew Kay
2019-07-31 19:10:52 -05:00
parent 82a53cbd28
commit ea9a40d42e
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
oec/controller.py
View File

@@ -34,11 +34,11 @@ class Controller:
self.connected_poll_period = 1 / 10 self.connected_poll_period = 1 / 10
self.disconnected_poll_period = 5 self.disconnected_poll_period = 5
self.last_poll_time = None
self.last_poll_response = None
def run(self): def run(self):
"""Run the controller.""" """Run the controller."""
last_poll_time = None
last_poll_response = None
self.running = True self.running = True
while self.running: while self.running:
@@ -48,8 +48,6 @@ class Controller:
except SessionDisconnectedError: except SessionDisconnectedError:
self._handle_session_disconnected() self._handle_session_disconnected()
last_poll_time = self._poll_delay(last_poll_time, last_poll_response)
try: try:
poll_response = self._poll() poll_response = self._poll()
except ReceiveTimeout: except ReceiveTimeout:
@@ -70,8 +68,6 @@ class Controller:
if poll_response: if poll_response:
self._handle_poll_response(poll_response) self._handle_poll_response(poll_response)
last_poll_response = poll_response
def _handle_terminal_attached(self, poll_response): def _handle_terminal_attached(self, poll_response):
self.logger.info('Terminal attached') self.logger.info('Terminal attached')
@@ -143,6 +139,13 @@ class Controller:
self.session.handle_key(key, modifiers, scan_code) self.session.handle_key(key, modifiers, scan_code)
def _poll(self): def _poll(self):
delay = self._calculate_poll_delay()
if delay > 0:
time.sleep(delay)
self.last_poll_time = time.perf_counter()
poll_response = poll(self.interface, timeout=1) poll_response = poll(self.interface, timeout=1)
if poll_response: if poll_response:
@@ -153,18 +156,20 @@ class Controller:
except ProtocolError as error: except ProtocolError as error:
self.logger.warning(f'POLL_ACK protocol error: {error}', exc_info=error) self.logger.warning(f'POLL_ACK protocol error: {error}', exc_info=error)
self.last_poll_response = poll_response
return poll_response return poll_response
def _poll_delay(self, last_poll_time, last_poll_response): def _calculate_poll_delay(self):
if last_poll_response is None and last_poll_time is not None: if self.last_poll_response is not None:
if self.terminal: return 0
period = self.connected_poll_period
else:
period = self.disconnected_poll_period
delay = (last_poll_time + period) - time.perf_counter() if self.last_poll_time is None:
return 0
if delay > 0: if self.terminal:
time.sleep(delay) period = self.connected_poll_period
else:
period = self.disconnected_poll_period
return time.perf_counter() return (self.last_poll_time + period) - time.perf_counter()