tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If update_first is False make it first wait and then update 

Reason: otherwise it is likely that two updating processes are being run
simultaneously. With the current code it is not impossible as well, but less
likely.
This commit is contained in:
ZyX 2014-02-23 12:21:38 +04:00
parent 66a2087474
commit 5111d9baf6
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
powerline/lib/threaded.py
View File

@ -53,13 +53,10 @@ class ThreadedSegment(MultiRunnedThread):
# cursor”. # cursor”.
# #
# If running once .update() is called in __call__. # If running once .update() is called in __call__.
update_value = self.get_update_value(update_first and self.update_first)
self.start() self.start()
elif not self.updated: update_value = self.get_update_value(self.do_update_first)
update_value = self.get_update_value(True)
self.updated = True
else: else:
update_value = self.get_update_value() update_value = self.get_update_value(not self.updated)
if self.crashed: if self.crashed:
return self.crashed_value return self.crashed_value
@ -77,6 +74,7 @@ class ThreadedSegment(MultiRunnedThread):
self.crashed = True self.crashed = True
else: else:
self.crashed = False self.crashed = False
self.updated = True
def get_update_value(self, update=False): def get_update_value(self, update=False):
if update: if update:
@ -84,10 +82,16 @@ class ThreadedSegment(MultiRunnedThread):
return self.update_value return self.update_value
def run(self): def run(self):
while not self.shutdown_event.is_set(): if self.do_update_first:
start_time = monotonic() start_time = monotonic()
self.set_update_value() while not self.shutdown_event.wait(max(self.interval - (monotonic() - start_time), self.min_sleep_time)):
self.shutdown_event.wait(max(self.interval - (monotonic() - start_time), self.min_sleep_time)) start_time = monotonic()
self.set_update_value()
else:
while not self.shutdown_event.is_set():
start_time = monotonic()
self.set_update_value()
self.shutdown_event.wait(max(self.interval - (monotonic() - start_time), self.min_sleep_time))
def shutdown(self): def shutdown(self):
self.shutdown_event.set() self.shutdown_event.set()
@ -107,7 +111,8 @@ class ThreadedSegment(MultiRunnedThread):
def set_state(self, interval=None, update_first=True, shutdown_event=None, **kwargs): def set_state(self, interval=None, update_first=True, shutdown_event=None, **kwargs):
self.set_interval(interval) self.set_interval(interval)
self.shutdown_event = shutdown_event or Event() self.shutdown_event = shutdown_event or Event()
self.updated = self.updated or (not (update_first and self.update_first)) self.do_update_first = update_first and self.update_first
self.updated = self.updated or (not self.do_update_first)
def startup(self, pl, **kwargs): def startup(self, pl, **kwargs):
self.run_once = False self.run_once = False