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

Add write_lock to KwThreadedSegment 

Otherwise it is not safe to use. ThreadedSegment does not need write locks.

New variant spends much less time locked in both threads
This commit is contained in:
ZyX 2013-03-30 16:57:04 +04:00
parent e2b13d9bba
commit 388cccb3cf
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
powerline/lib/threaded.py
View File

@ -126,6 +126,8 @@ class KwThreadedSegment(ThreadedSegment):
super(KwThreadedSegment, self).__init__() super(KwThreadedSegment, self).__init__()
self.updated = True self.updated = True
self.update_value = ({}, set()) self.update_value = ({}, set())
self.write_lock = Lock()
self.new_queries = {}
@staticmethod @staticmethod
def key(**kwargs): def key(**kwargs):
@ -144,7 +146,8 @@ class KwThreadedSegment(ThreadedSegment):
# configuration or in subclasses. # configuration or in subclasses.
update_state = self.compute_state(key) if update_first and self.update_first or self.run_once else None update_state = self.compute_state(key) if update_first and self.update_first or self.run_once else None
queries[key] = (monotonic(), update_state) with self.write_lock:
self.new_queries[key] = (monotonic(), update_state)
return self.render_one(update_state, **kwargs) return self.render_one(update_state, **kwargs)
def update(self, old_update_value): def update(self, old_update_value):
@ -152,6 +155,11 @@ class KwThreadedSegment(ThreadedSegment):
crashed = set() crashed = set()
update_value = (updates, crashed) update_value = (updates, crashed)
queries = old_update_value[0] queries = old_update_value[0]
with self.write_lock:
if self.new_queries:
queries.update(self.new_queries)
self.new_queries.clear()
for key, (last_query_time, state) in queries.items(): for key, (last_query_time, state) in queries.items():
if last_query_time < monotonic() < last_query_time + self.drop_interval: if last_query_time < monotonic() < last_query_time + self.drop_interval:
try: try: