l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core+tests] Improved poll handling

Browse source 
- mock poll instead of epoll
- increase timeout for poll (1ms is a lot of system load for nothing)
This commit is contained in:
Tobias Witek 2019-06-23 16:51:28 +02:00
parent ff82604036
commit 928c37a972
4 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bumblebee/input.py
View file

@ -25,15 +25,15 @@ def is_terminated():
def read_input(inp):
"""Read i3bar input and execute callbacks"""
epoll = select.poll()
epoll.register(sys.stdin.fileno())
poll = select.poll()
poll.register(sys.stdin.fileno(), select.POLLIN)
log.debug("starting click event processing")
while inp.running:
if is_terminated():
return
try:
events = epoll.poll(1)
events = poll.poll(1000)
except Exception:
continue
for fileno, event in events:
@ -52,8 +52,8 @@ def read_input(inp):
except ValueError as e:
log.debug("failed to parse event: {}".format(e))
log.debug("exiting click event processing")
epoll.unregister(sys.stdin.fileno())
epoll.close()
poll.unregister(sys.stdin.fileno())
poll.close()
inp.has_event = True
inp.clean_exit = True

23
bumblebee/modules/datetimetz.py
View file

@ -17,8 +17,11 @@ Parameters:
from __future__ import absolute_import
import datetime
import locale
import pytz
import tzlocal
try:
import pytz
import tzlocal
except:
pass
import bumblebee.input
import bumblebee.output
import bumblebee.engine
@ -40,7 +43,10 @@ class Module(bumblebee.engine.Module):
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, cmd=self.next_tz)
engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE, cmd=self.prev_tz)
self._fmt = self.parameter("format", default_format(self.name))
self._timezones = self.parameter("timezone", tzlocal.get_localzone().zone).split(",")
try:
self._timezones = self.parameter("timezone", tzlocal.get_localzone().zone).split(",")
except:
self._timezones = ""
self._current_tz = 0
l = locale.getdefaultlocale()
@ -54,10 +60,13 @@ class Module(bumblebee.engine.Module):
def get_time(self, widget):
try:
tz = pytz.timezone(self._timezones[self._current_tz].strip())
retval = datetime.datetime.now(tz=tzlocal.get_localzone()).astimezone(tz).strftime(self._fmt)
except pytz.exceptions.UnknownTimeZoneError:
retval = "[Unknown timezone: {}]".format(self._timezones[self._current_tz].strip())
try:
tz = pytz.timezone(self._timezones[self._current_tz].strip())
retval = datetime.datetime.now(tz=tzlocal.get_localzone()).astimezone(tz).strftime(self._fmt)
except pytz.exceptions.UnknownTimeZoneError:
retval = "[Unknown timezone: {}]".format(self._timezones[self._current_tz].strip())
except:
retval = "[n/a]"
enc = locale.getpreferredencoding()
if hasattr(retval, "decode"):