FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 01:46:15 +01:00
Code Issues Projects Releases Wiki Activity

msvcdeps: refactor cache lock

Browse Source 
Rework how msvcdeps' cached_nodes lock is used so acquiring the lock is
only necessary on a cache miss. Also use a "with" context manager to
simplify management of the lock lifecycle.
This commit is contained in:
Michael Vincent 2019-04-25 16:28:19 -05:00
parent e874342103
commit 8b5a2a2086
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
waflib/extras/msvcdeps.py
View File

@ -64,14 +64,17 @@ def path_to_node(base_node, path, cached_nodes):
else: else:
# Not hashable, assume it is a list and join into a string # Not hashable, assume it is a list and join into a string
node_lookup_key = (base_node, os.path.sep.join(path)) node_lookup_key = (base_node, os.path.sep.join(path))
try: try:
lock.acquire()
node = cached_nodes[node_lookup_key] node = cached_nodes[node_lookup_key]
except KeyError: except KeyError:
node = base_node.find_resource(path) # retry with lock on cache miss
cached_nodes[node_lookup_key] = node with lock:
finally: try:
lock.release() node = cached_nodes[node_lookup_key]
except KeyError:
node = cached_nodes[node_lookup_key] = base_node.find_resource(path)
return node return node
def post_run(self): def post_run(self):