RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polling: it may happen that the receiver is removed mid-poll

This commit is contained in:
Daniel Pavel 2013-06-19 16:14:04 +02:00
parent cd44cc6396
commit 56a7a960c3
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/solaar/listener.py
View File

@ -81,10 +81,6 @@ class ReceiverListener(_listener.EventsListener):
if not self.tick_period: if not self.tick_period:
raise Exception("tick() should not be called without a tick_period: %s", self) raise Exception("tick() should not be called without a tick_period: %s", self)
if not self.receiver:
# just in case the receiver was just removed
return
# not necessary anymore, we're now using udev monitor to watch for receiver status # not necessary anymore, we're now using udev monitor to watch for receiver status
# if self._last_tick > 0 and timestamp - self._last_tick > _POLL_TICK * 2: # if self._last_tick > 0 and timestamp - self._last_tick > _POLL_TICK * 2:
# # if we missed a couple of polls, most likely the computer went into # # if we missed a couple of polls, most likely the computer went into
@ -95,26 +91,29 @@ class ReceiverListener(_listener.EventsListener):
self._last_tick = timestamp self._last_tick = timestamp
# read these in case they haven't been read already try:
# self.receiver.serial, self.receiver.firmware # read these in case they haven't been read already
if self.receiver.status.lock_open: # self.receiver.serial, self.receiver.firmware
# don't mess with stuff while pairing if self.receiver.status.lock_open:
return # don't mess with stuff while pairing
return
self.receiver.status.poll(timestamp) self.receiver.status.poll(timestamp)
# Iterating directly through the reciver would unnecessarily probe # Iterating directly through the reciver would unnecessarily probe
# all possible devices, even unpaired ones. # all possible devices, even unpaired ones.
# Checking for each device number in turn makes sure only already # Checking for each device number in turn makes sure only already
# known devices are polled. # known devices are polled.
# This is okay because we should have already known about them all # This is okay because we should have already known about them all
# long before the first poll() happents, through notifications. # long before the first poll() happents, through notifications.
for number in range(1, 6): for number in range(1, 6):
if number in self.receiver: if number in self.receiver:
dev = self.receiver[number] dev = self.receiver[number]
assert dev assert dev
if dev.status is not None: if dev.status is not None:
dev.status.poll(timestamp) dev.status.poll(timestamp)
except Exception as e:
_log.exception("polling", e)
def _status_changed(self, device, alert=_status.ALERT.NONE, reason=None): def _status_changed(self, device, alert=_status.ALERT.NONE, reason=None):
assert device is not None assert device is not None