StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "FileImage: make thread-safe"

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-13 01:15:16 +00:00
committed by Gerrit Code Review
parent fc6948b588 55988c4677
commit c7b0df0295
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/blockimgdiff.py
View File

@@ -205,6 +205,8 @@ class FileImage(Image):
self.clobbered_blocks = RangeSet() self.clobbered_blocks = RangeSet()
self.extended = RangeSet() self.extended = RangeSet()
self.generator_lock = threading.Lock()
self.hashtree_info = None self.hashtree_info = None
if hashtree_info_generator: if hashtree_info_generator:
self.hashtree_info = hashtree_info_generator.Generate(self) self.hashtree_info = hashtree_info_generator.Generate(self)
@@ -236,10 +238,13 @@ class FileImage(Image):
self._file.close() self._file.close()
def _GetRangeData(self, ranges): def _GetRangeData(self, ranges):
for s, e in ranges: # Use a lock to protect the generator so that we will not run two
self._file.seek(s * self.blocksize) # instances of this generator on the same object simultaneously.
for _ in range(s, e): with self.generator_lock:
yield self._file.read(self.blocksize) for s, e in ranges:
self._file.seek(s * self.blocksize)
for _ in range(s, e):
yield self._file.read(self.blocksize)
def RangeSha1(self, ranges): def RangeSha1(self, ranges):
h = sha1() h = sha1()